Changeset 182 in MondoRescue

Timestamp:

Dec 13, 2005, 2:17:16 AM (18 years ago)

Author:

bcornec

Message:

disable x11 build by default
g_mondo_home is now computed at compile time with a define

Location:

branches/2.05/mondo

Files:

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

branches/2.05/mondo/configure.in

@@ -30 +30 @@
 dnl --with/--enable stuff
 do_static_mr=
-AC_ARG_WITH(x11, AS_HELP_STRING(--with-x11,Create libXmondo and XMondo for X11/KDE support), do_x=$withval, do_x= )
+AC_ARG_ENABLE(x11, AS_HELP_STRING(--enable-x11,Create libXmondo and XMondo for X11/KDE support), do_x=$withval, do_x= )
 AC_ARG_ENABLE(static-mr, AS_HELP_STRING(--enable-static-mr,Link mondorestore statically), do_static_mr=$withval, do_static_mr= )
 AC_ARG_ENABLE(debug, AS_HELP_STRING(--enable-debug,Add debugging flags), CFLAGS="$CFLAGS -g", )
@@ -43 +43 @@
 AC_DEFINE_UNQUOTED(MAX_NOOF_MEDIA, $max_noof_media, [Maximum number of media])
 AC_DEFINE_UNQUOTED(EXTTAPE, $exttape, [Tape blocksize])
-if test -n "$do_x"; then
+if test x$do_x = xyes; then
     AC_DEFINE(WITH_X, 1, [Define if compiled with X support])
 else
@@ -62 +62 @@
         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

branches/2.05/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 \
@@ -27 +29 @@
                        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@

branches/2.05/mondo/mondo/common/libmondo-tools.c

@@ -352 +352 @@
 {
     assert(home_sz != NULL);
-    strcpy(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') {
-        strcpy(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') {
-        return (1);
-    } else {
-        return (0);
-    }
+    strcpy(home_sz, MONDO_LIB);
+    return (0);
 }