Changeset 182


Ignore:
Timestamp:
Dec 13, 2005, 2:17:16 AM (13 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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.05/mondo/configure.in

    r179 r182  
    3030dnl --with/--enable stuff
    3131do_static_mr=
    32 AC_ARG_WITH(x11, AS_HELP_STRING(--with-x11,Create libXmondo and XMondo for X11/KDE support), do_x=$withval, do_x= )
     32AC_ARG_ENABLE(x11, AS_HELP_STRING(--enable-x11,Create libXmondo and XMondo for X11/KDE support), do_x=$withval, do_x= )
    3333AC_ARG_ENABLE(static-mr, AS_HELP_STRING(--enable-static-mr,Link mondorestore statically), do_static_mr=$withval, do_static_mr= )
    3434AC_ARG_ENABLE(debug, AS_HELP_STRING(--enable-debug,Add debugging flags), CFLAGS="$CFLAGS -g", )
     
    4343AC_DEFINE_UNQUOTED(MAX_NOOF_MEDIA, $max_noof_media, [Maximum number of media])
    4444AC_DEFINE_UNQUOTED(EXTTAPE, $exttape, [Tape blocksize])
    45 if test -n "$do_x"; then
     45if test x$do_x = xyes; then
    4646    AC_DEFINE(WITH_X, 1, [Define if compiled with X support])
    4747else
     
    6262        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)
    6363        if test $standardthread -eq 0; then
    64             CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -D_REENTRANT -I/usr/local/include/pthread/linuxthreads"
     64            CPPFLAGS=$CPPFLAGS -D_THREAD_SAFE -D_REENTRANT -I/usr/local/include/pthread/linuxthreads
    6565            PTHREAD="-L/usr/local/lib -llthread -llgcc_r";
    6666            if ! test -f /usr/local/include/pthread/linuxthreads/pthread.h; then
  • branches/2.05/mondo/mondo/common/Makefile.am

    r30 r182  
    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 \
     
    2729                       libmondo-mountlist.c libmondo-raid.c \
    2830                       libmondo-stream.c libmondo-string.c libmondo-tools.c \
    29                        libmondo-verify.c 
     31                       libmondo-verify.c
    3032libmondo_la_LDFLAGS  = -version-info 2:3:0 -shrext .so
    3133libmondo_la_LIBADD   = @LIBS@
  • branches/2.05/mondo/mondo/common/libmondo-tools.c

    r165 r182  
    352352{
    353353    assert(home_sz != NULL);
    354     strcpy(home_sz,
    355            call_program_and_get_last_line_of_output
    356            ("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"));
    357 
    358     if (home_sz[0] == '\0') {
    359         strcpy(home_sz,
    360                call_program_and_get_last_line_of_output
    361                ("find /usr -type d -path '*/mondo/restore-scripts' -follow -maxdepth 3 -printf '%h\n' 2> /dev/null"));
    362     }
    363     if (home_sz[0] == '\0') {
    364         return (1);
    365     } else {
    366         return (0);
    367     }
     354    strcpy(home_sz, MONDO_LIB);
     355    return (0);
    368356}
    369357
Note: See TracChangeset for help on using the changeset viewer.