Changeset 183


Ignore:
Timestamp:
Dec 13, 2005, 2:20:45 AM (13 years ago)
Author:
bcornec
Message:

merge -r180:182 $SVN_M/branches/2.05

Location:
trunk/mondo
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/configure.in

    r181 r183  
    5555        AC_ARG_ENABLE(standard-pthreads, AS_HELP_STRING(--enable-standard-pthreads,(FreeBSD only) Compile with FreeBSD "standard" pthreads instead of LinuxThreads -- *MAY BE UNSTABLE*), standardthread=1, standardthread=0)
    5656        if test $standardthread -eq 0; then
    57             CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -D_REENTRANT -I/usr/local/include/pthread/linuxthreads"
     57            CPPFLAGS=$CPPFLAGS -D_THREAD_SAFE -D_REENTRANT -I/usr/local/include/pthread/linuxthreads
    5858            PTHREAD="-L/usr/local/lib -llthread -llgcc_r";
    5959            if ! test -f /usr/local/include/pthread/linuxthreads/pthread.h; then
  • trunk/mondo/mondo/common/Makefile.am

    r129 r183  
    33##
    44
     5AM_CPPFLAGS = -DMONDO_LIB=\"$(pkglibdir)\"
    56## Headers
     7
    68noinst_HEADERS       = libmondo-archive.h libmondo-devices.h \
    79                       libmondo-filelist.h libmondo-files.h libmondo-fork.h \
     
    2426                       libmondo-mountlist.c libmondo-raid.c \
    2527                       libmondo-stream.c libmondo-string.c libmondo-tools.c \
    26                        libmondo-verify.c 
     28                       libmondo-verify.c
    2729libmondo_la_LDFLAGS  = -version-info 2:3:0 -shrext .so
    2830libmondo_la_LIBADD   = @LIBS@
  • trunk/mondo/mondo/common/libmondo-tools.c

    r171 r183  
    190190    char *home_sz = NULL;
    191191
    192     asprintf(&home_sz,
    193              call_program_and_get_last_line_of_output
    194              ("find /usr/lib/ /usr/local/ /usr/share/ /usr/local/share/ /opt/ /ramdisk/usr/share/ -type d -maxdepth 2 -name include -prune -o -type d -maxdepth 2 -path '*/mondo/restore-scripts' -printf '%h\n' 2> /dev/null"));
    195 
    196     if (home_sz[0] == '\0') {
    197         paranoid_free(home_sz);
    198         asprintf(&home_sz,
    199                  call_program_and_get_last_line_of_output
    200                  ("find /usr -type d -path '*/mondo/restore-scripts' -follow -maxdepth 3 -printf '%h\n' 2> /dev/null"));
    201     }
    202     if (home_sz[0] == '\0') {
    203         paranoid_free(home_sz);
    204         home_sz = NULL;
    205     } else {
    206         log_it("mondoarchive home found at %s", home_sz);
    207     }
     192    asprintf(&home_sz, MONDO_LIB);
    208193    return (home_sz);
    209194}
Note: See TracChangeset for help on using the changeset viewer.