Changeset 183 in MondoRescue for trunk

Timestamp:

Dec 13, 2005, 2:20:45 AM (19 years ago)

Author:

bcornec

Message:

merge -r180:182 $SVN_M/branches/2.05

Location:

trunk/mondo

Files:

• configure.in (modified) (1 diff)
• mondo/common/Makefile.am (modified) (2 diffs)
• mondo/common/libmondo-tools.c (modified) (1 diff)

trunk/mondo/configure.in

@@ -55 +55 @@
         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)
         if test $standardthread -eq 0; then
-            CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -D_REENTRANT -I/usr/local/include/pthread/linuxthreads"
+            CPPFLAGS=$CPPFLAGS -D_THREAD_SAFE -D_REENTRANT -I/usr/local/include/pthread/linuxthreads
             PTHREAD="-L/usr/local/lib -llthread -llgcc_r";
             if ! test -f /usr/local/include/pthread/linuxthreads/pthread.h; then

trunk/mondo/mondo/common/Makefile.am

@@ -3 +3 @@
 ##
 
+AM_CPPFLAGS = -DMONDO_LIB=\"$(pkglibdir)\"
 ## Headers
+
 noinst_HEADERS       = libmondo-archive.h libmondo-devices.h \
                        libmondo-filelist.h libmondo-files.h libmondo-fork.h \
@@ -24 +26 @@
                        libmondo-mountlist.c libmondo-raid.c \
                        libmondo-stream.c libmondo-string.c libmondo-tools.c \
-                       libmondo-verify.c 
+                       libmondo-verify.c
 libmondo_la_LDFLAGS  = -version-info 2:3:0 -shrext .so
 libmondo_la_LIBADD   = @LIBS@

trunk/mondo/mondo/common/libmondo-tools.c

@@ -190 +190 @@
     char *home_sz = NULL;
 
-    asprintf(&home_sz,
-             call_program_and_get_last_line_of_output
-             ("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"));
-
-    if (home_sz[0] == '\0') {
-        paranoid_free(home_sz);
-        asprintf(&home_sz,
-                 call_program_and_get_last_line_of_output
-                 ("find /usr -type d -path '*/mondo/restore-scripts' -follow -maxdepth 3 -printf '%h\n' 2> /dev/null"));
-    }
-    if (home_sz[0] == '\0') {
-        paranoid_free(home_sz);
-        home_sz = NULL;
-    } else {
-        log_it("mondoarchive home found at %s", home_sz);
-    }
+    asprintf(&home_sz, MONDO_LIB);
     return (home_sz);
 }