X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=a1b1fd9c641191fa7d0b91aca096672dc7ad721b;hb=2d3535a82513c47d34f3016b87099af1bcff8bc2;hp=e92bb4103fee49bd2dedc0ae074a501fc2da53b4;hpb=4f2d0d321c758420f5c9eb98f053adfce28100aa;p=bacula%2Fbacula diff --git a/bacula/configure b/bacula/configure index e92bb4103f..a1b1fd9c64 100755 --- a/bacula/configure +++ b/bacula/configure @@ -308,7 +308,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG build build_cpu build_vendor build_os host host_cpu host_vendor host_os VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED AWK ECHO CMP TBL AR OPENSSL MTX PKGCONFIG ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE MSGFMT GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOMEGNORBA_LIBS GTKXMHTML_LIBS ZVT_LIBS GNOME_CONFIG ORBIT_CONFIG ORBIT_IDL HAVE_ORBIT_TRUE HAVE_ORBIT_FALSE ORBIT_CFLAGS ORBIT_LIBS HAVE_GNORBA_TRUE HAVE_GNORBA_FALSE GNORBA_CFLAGS GNORBA_LIBS GNOME_APPLETS_LIBS GNOME_DOCKLETS_LIBS GNOME_CAPPLET_LIBS GNOME_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS ALL_DIRS CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password dir_user dir_group sd_user sd_group fd_user fd_group SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS ALLOCA FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS OBJLIST hostname TAPEDRIVE PSCMD WIN32 DISTNAME DISTVER LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED AWK ECHO CMP TBL AR OPENSSL MTX PKGCONFIG WXCONFIG CDRECORD ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE MSGFMT GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOMEGNORBA_LIBS GTKXMHTML_LIBS ZVT_LIBS GNOME_CONFIG ORBIT_CONFIG ORBIT_IDL HAVE_ORBIT_TRUE HAVE_ORBIT_FALSE ORBIT_CFLAGS ORBIT_LIBS HAVE_GNORBA_TRUE HAVE_GNORBA_FALSE GNORBA_CFLAGS GNORBA_LIBS GNOME_APPLETS_LIBS GNOME_DOCKLETS_LIBS GNOME_CAPPLET_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC CDSTL working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS ALLOCA FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS' ac_subst_files='MCOMMON' # Initialize some variables set by options. @@ -856,6 +856,8 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-gnome enable build of gnome-console GUI disabled + --enable-wx-console enable build of wxWidgets console disabled + --enable-tray-monitor enable build of Gnome tray monitor (compatible with KDE) disabled --enable-smartalloc enable smartalloc debugging support disabled --enable-static-tools enable static tape tools disabled --enable-static-fd enable static File daemon disabled @@ -888,26 +890,27 @@ Optional Packages: --with-dir-password=PASSWORD specify Director's password --with-fd-password=PASSWORD specify Client's password --with-sd-password=PASSWORD specify Storage daemon's password + --with-mon-dir-password=PASSWORD specify Director's password used by the monitor + --with-mon-fd-password=PASSWORD specify Client's password used by the monitor + --with-mon-sd-password=PASSWORD specify Storage daemon's password used by the monitor --with-dir-user=USER specify user for Director daemon --with-dir-group=GROUP specify group for Director daemon --with-sd-user=USER specify user for Storage daemon --with-sd-group=GROUP specify group for Storage daemon --with-fd-user=USER specify user for File daemon --with-fd-group=GROUP specify group for File daemon + --with-sbin-perm=MODE specify permissions for sbin binaries (0754) --with-postgresql=DIR Include PostgreSQL support. DIR is the PostgreSQL base install directory, defaults to /usr/local/pgsql -Which DBMS do you want to use (please select only one): --with-mysql=DIR Include MySQL support. DIR is the MySQL base install directory, default is to search through a number of common places for the MySQL files. -Which DBMS do you want to use (please select only one): --with-embedded-mysql=DIR Include MySQL support. DIR is the MySQL base install directory, default is to search through a number of common places for the MySQL files. -Which DBMS do you want to use (please select only one): --with-sqlite=DIR Include SQLite support. DIR is the SQLite base install directory, default is to search through a number of common places for the SQLite files. @@ -1457,60 +1460,7 @@ done test -n "$FALSEPRG" || FALSEPRG=":" -# Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 -build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 -host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - +#AC_CANONICAL_HOST VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` DATE=`sed -n -e 's/^.* \t*BDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` @@ -3625,46 +3575,6 @@ else echo "${ECHO_T}no" >&6 fi -# Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $RANLIB in - [\\/]* | ?:[\\/]*) - ac_cv_path_RANLIB="$RANLIB" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_RANLIB" && ac_cv_path_RANLIB="ranlib" - ;; -esac -fi -RANLIB=$ac_cv_path_RANLIB - -if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - # Extract the first word of "openssl", so it can be a program name with args. set dummy openssl; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -3785,6 +3695,85 @@ else echo "${ECHO_T}no" >&6 fi +# Extract the first word of "wx-config", so it can be a program name with args. +set dummy wx-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_WXCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $WXCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_WXCONFIG="$WXCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_WXCONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_WXCONFIG" && ac_cv_path_WXCONFIG="wx-config" + ;; +esac +fi +WXCONFIG=$ac_cv_path_WXCONFIG + +if test -n "$WXCONFIG"; then + echo "$as_me:$LINENO: result: $WXCONFIG" >&5 +echo "${ECHO_T}$WXCONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +# Extract the first word of "cdrecord", so it can be a program name with args. +set dummy cdrecord; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_CDRECORD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $CDRECORD in + [\\/]* | ?:[\\/]*) + ac_cv_path_CDRECORD="$CDRECORD" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_CDRECORD="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +CDRECORD=$ac_cv_path_CDRECORD + +if test -n "$CDRECORD"; then + echo "$as_me:$LINENO: result: $CDRECORD" >&5 +echo "${ECHO_T}$CDRECORD" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + test -n "$ARFLAG" || ARFLAGS="cr" @@ -3799,8 +3788,60 @@ MAKE_SHELL=/bin/sh -echo "$as_me:$LINENO: checking for Operating System" >&5 -echo $ECHO_N "checking for Operating System... $ECHO_C" >&6 +# Make sure we can run config.sub. +$ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 +echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6 +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_build_alias=$build_alias +test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` +test -z "$ac_cv_build_alias" && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6 +build=$ac_cv_build +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + + +echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_host_alias=$host_alias +test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6 +host=$ac_cv_host +host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + case $host_os in *cygwin* ) CYGWIN=yes;; @@ -4131,9 +4172,6 @@ else fi fi -echo "$as_me:$LINENO: result: \" \"" >&5 -echo "${ECHO_T}\" \"" >&6 - # ----------------------------------------------------------- # ---------------------------------------------------------- @@ -4178,6 +4216,9 @@ then elif test -f /etc/mandrake-release then DISTNAME=mandrake +elif test -f /etc/whitebox-release +then + DISTNAME=redhat elif test -f /etc/redhat-release then DISTNAME=redhat @@ -4206,8 +4247,8 @@ _ACEOF else DISTNAME=unknown fi -echo "$as_me:$LINENO: result: \" \"" >&5 -echo "${ECHO_T}\" \"" >&6 +echo "$as_me:$LINENO: result: done" >&5 +echo "${ECHO_T}done" >&6 # ----------------------------------------------------------- @@ -4322,9 +4363,10 @@ support_mysql=no support_sqlite=no support_postgresql=no support_smartalloc=yes -support_readline=no +support_readline=yes support_conio=yes support_gnome=no +support_wx_console=no gnome_version= support_static_tools=no support_static_fd=no @@ -4353,10 +4395,10 @@ if test x$support_gnome = xyes; then abc=`$PKGCONFIG --exists libgnomeui-2.0` pkg=$? if test $pkg = 0; then - GNOME_INCLUDEDIR=`pkg-config --cflags-only-I libgnomeui-2.0` - GNOMEUI_LIBS=`pkg-config --libs-only-l libgnomeui-2.0` - GNOME_LIBDIR=`pkg-config --libs libgnomeui-2.0` - GNOME_LIBS=`pkg-config --libs-only-l libgnomeui-2.0` + GNOME_INCLUDEDIR=`$PKGCONFIG --cflags-only-I libgnomeui-2.0` + GNOMEUI_LIBS=`$PKGCONFIG --libs-only-l libgnomeui-2.0` + GNOME_LIBDIR=`$PKGCONFIG --libs libgnomeui-2.0` + GNOME_LIBS=`$PKGCONFIG --libs-only-l libgnomeui-2.0` @@ -4710,6 +4752,70 @@ fi +# ------------------------------------------- +# wx-console (default off) +# ------------------------------------------- +# Check whether --enable-wx-console or --disable-wx-console was given. +if test "${enable_wx_console+set}" = set; then + enableval="$enable_wx_console" + if test x$enableval = xyes; then + support_wx_console=yes + fi +fi; + +WX_DIR= +if test x$support_wx_console = xyes; then + abc=`$WXCONFIG --cppflags` + pkg=$? + if test $pkg = 0; then + WXCONS_CPPFLAGS=`$WXCONFIG --cppflags` + WXCONS_LDFLAGS=`$WXCONFIG --libs` + + + WX_DIR=src/wx-console + else + echo " " + echo "wx-config program not found. wx-console disabled." + echo " " + support_wx_console=no + fi +fi + + + +# ------------------------------------------- +# tray-monitor (default off) +# ------------------------------------------- +# Check whether --enable-tray-monitor or --disable-tray-monitor was given. +if test "${enable_tray_monitor+set}" = set; then + enableval="$enable_tray_monitor" + if test x$enableval = xyes; then + support_tray_monitor=yes + fi +fi; + +TRAY_MONITOR_DIR= +if test x$support_tray_monitor = xyes; then + abc=`$PKGCONFIG --exists gtk+-2.0` + pkg=$? + if test $pkg = 0; then + TRAY_MONITOR_CPPFLAGS=`$PKGCONFIG --cflags gtk+-2.0` + TRAY_MONITOR_LDFLAGS=`$PKGCONFIG --libs gtk+-2.0` + + + TRAY_MONITOR_DIR=src/tray-monitor + abc=`$PKGCONFIG --atleast-version=2.4 gtk+-2.0` + pkg=$? + if test $pkg = 0; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_GTK_2_4 1 +_ACEOF + + fi + fi +fi + + # ------------------------------------------- # smartalloc (default off) # ------------------------------------------- @@ -4809,13 +4915,16 @@ fi; STATIC_CONS= STATIC_GNOME_CONS= +STATIC_WX_CONS= if test x$support_static_cons = xyes; then STATIC_CONS="static-bconsole" STATIC_GNOME_CONS="static-gnome-console" + STATIC_WX_CONS="static-wx-console" fi + # ------------------------------------------- # client_only (default off) # ------------------------------------------- @@ -4824,6 +4933,8 @@ if test "${enable_client_only+set}" = set; then enableval="$enable_client_only" if test x$enableval = xyes; then build_client_only=yes + db_name=None + DB_NAME=none fi fi; if test x$build_client_only = xno; then @@ -4847,9 +4958,6 @@ fi; got_conio="no" if test x$support_conio = xyes; then - CONS_OBJ="conio.o" - CONS_SRC="conio.c" - got_conio="yes" echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then @@ -5073,22 +5181,18 @@ fi done - -for ac_header in termcap.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if test "${ac_cv_header_termcap_h+set}" = set; then + echo "$as_me:$LINENO: checking for termcap.h" >&5 +echo $ECHO_N "checking for termcap.h... $ECHO_C" >&6 +if test "${ac_cv_header_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +echo "$as_me:$LINENO: result: $ac_cv_header_termcap_h" >&5 +echo "${ECHO_T}$ac_cv_header_termcap_h" >&6 else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking termcap.h usability" >&5 +echo $ECHO_N "checking termcap.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -5097,7 +5201,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <$ac_header> +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -5123,8 +5227,8 @@ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking termcap.h presence" >&5 +echo $ECHO_N "checking termcap.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -5132,7 +5236,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -5165,10 +5269,10 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? case $ac_header_compiler:$ac_header_preproc in yes:no ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: termcap.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: termcap.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: termcap.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: termcap.h: proceeding with the preprocessor's result" >&2;} ( cat <<\_ASBOX ## ------------------------------------ ## @@ -5179,12 +5283,12 @@ _ASBOX sed "s/^/$as_me: WARNING: /" >&2 ;; no:yes ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: termcap.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: termcap.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: termcap.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: termcap.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: termcap.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: termcap.h: proceeding with the preprocessor's result" >&2;} ( cat <<\_ASBOX ## ------------------------------------ ## @@ -5195,26 +5299,18 @@ _ASBOX sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +echo "$as_me:$LINENO: checking for termcap.h" >&5 +echo $ECHO_N "checking for termcap.h... $ECHO_C" >&6 +if test "${ac_cv_header_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - + ac_cv_header_termcap_h=$ac_header_preproc fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +echo "$as_me:$LINENO: result: $ac_cv_header_termcap_h" >&5 +echo "${ECHO_T}$ac_cv_header_termcap_h" >&6 fi - -done - +if test $ac_cv_header_termcap_h = yes; then echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5 echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6 if test "${ac_cv_lib_termcap_tgetent+set}" = set; then @@ -5270,15 +5366,97 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5 echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6 if test $ac_cv_lib_termcap_tgetent = yes; then - CONS_LIBS="-ltermcap" -fi + CONS_LIBS="-ltermcap" + CONS_OBJ="conio.o" + CONS_SRC="conio.c" + got_conio="yes" + support_readline=no + +cat >>confdefs.h <<\_ACEOF +#define HAVE_CONIO 1 +_ACEOF + + +else + echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5 +echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6 +if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lncurses $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char tgetent (); +int +main () +{ +tgetent (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ncurses_tgetent=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - support_readline=no +ac_cv_lib_ncurses_tgetent=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5 +echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6 +if test $ac_cv_lib_ncurses_tgetent = yes; then + CONS_LIBS="-lncurses" + CONS_OBJ="conio.o" + CONS_SRC="conio.c" + got_conio="yes" + support_readline=no cat >>confdefs.h <<\_ACEOF #define HAVE_CONIO 1 _ACEOF + +else + echo " "; echo "Neither termcap nor ncurses library found. CONIO turned off ..."; echo " " +fi + + +fi + + +else + echo " "; echo "termcap.h not found. CONIO turned off ..."; echo " " +fi + + fi @@ -5450,9 +5628,9 @@ _ACEOF got_readline="yes" else - { { echo "$as_me:$LINENO: error: *** readline library missing" >&5 -echo "$as_me: error: *** readline library missing" >&2;} - { (exit 1); exit 1; }; } + echo " " + echo "readline.h not found. readline turned off ..." + echo " " fi @@ -5747,9 +5925,9 @@ _ACEOF PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline" else - { { echo "$as_me:$LINENO: error: *** readline library missing" >&5 -echo "$as_me: error: *** readline library missing" >&2;} - { (exit 1); exit 1; }; } + echo " " + echo "readline.h not found. readline turned off ..." + echo " " fi @@ -5777,7 +5955,6 @@ fi # Minimal stuff for readline Makefile configuration MAKE_SHELL=/bin/sh - echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5 echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6 if test "${ac_cv_header_stat_broken+set}" = set; then @@ -6126,7 +6303,6 @@ fi - for ac_func in strcasecmp select setenv putenv tcgetattr setlocale lstat lchown do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -6211,7 +6387,8 @@ fi done -for ac_func in nanosleep + +for ac_func in nanosleep nl_langinfo do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -6295,7 +6472,6 @@ fi done - for ac_header in varargs.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -6441,6 +6617,22 @@ done # End of readline/conio stuff # ----------------------------------------------------------------------- +# ------------------------------------------- +# check for cdrecord writer location +# get scsibus,target,lun +# ------------------------------------------- +CDSTL="3,0,0" +if test ! x$CDRECORD = x ; then + CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD-RW | ${AWK} '{print $1}'` + if test x${CDSTL} = x ; then + CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD+RW | ${AWK} '{print $1}'` + fi + if test x${CDSTL} = x ; then + CDSTL="3,0,0" + fi +fi + + # --------------------------------------------------- # Check for GMP support/directory @@ -6685,7 +6877,7 @@ fi; # ------------------------------------------ # Where to place working dir # ------------------------------------------ -working_dir=`eval echo ${sysconfdir}/working` +working_dir=`eval echo ${prefix}/var/bacula/working` # Check whether --with-working-dir or --without-working-dir was given. if test "${with_working_dir+set}" = set; then @@ -6916,6 +7108,76 @@ if test "x$sd_password" = "x" ; then sd_password=$key fi +mon_dir_password= + +# Check whether --with-mon-dir-password or --without-mon-dir-password was given. +if test "${with_mon_dir_password+set}" = set; then + withval="$with_mon_dir_password" + + if test "x$withval" != "xno" ; then + mon_dir_password=$withval + fi + + +fi; + +if test "x$mon_dir_password" = "x" ; then + if test "x$OPENSSL" = "xnone" ; then +# key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" abcdefghijklmnopqrst | awk '{getline} {print} {exit}'` + key=`autoconf/randpass 33` + else + key=`openssl rand -base64 33` + fi + mon_dir_password=$key +fi + +mon_fd_password= + +# Check whether --with-mon-fd-password or --without-mon-fd-password was given. +if test "${with_mon_fd_password+set}" = set; then + withval="$with_mon_fd_password" + + if test "x$withval" != "xno" ; then + mon_fd_password=$withval + fi + + +fi; + +if test "x$mon_fd_password" = "x" ; then + if test "x$OPENSSL" = "xnone" ; then +# key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" tsrqponmlkjihgfedcba | awk '{getline} {print} {exit}'` + key=`autoconf/randpass 37` + else + key=`openssl rand -base64 33` + fi + mon_fd_password=$key +fi + +mon_sd_password= + +# Check whether --with-mon-sd-password or --without-mon-sd-password was given. +if test "${with_mon_sd_password+set}" = set; then + withval="$with_mon_sd_password" + + if test "x$withval" != "xno" ; then + mon_sd_password=$withval + fi + + +fi; + +if test "x$mon_sd_password" = "x" ; then + if test "x$OPENSSL" = "xnone" ; then +# key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" 123456789uvwxyzabcdef | awk '{getline} {print} {exit}'` + key=`autoconf/randpass 41` + else + key=`openssl rand -base64 33` + fi + mon_sd_password=$key +fi + + @@ -7013,6 +7275,24 @@ fi; +# +# allow setting default executable permissions +# +SBINPERM=0754 + +# Check whether --with-sbin-perm or --without-sbin-perm was given. +if test "${with_sbin_perm+set}" = set; then + withval="$with_sbin_perm" + + if test "x$withval" != "x" ; then + SBINPERM=$withval + fi + + +fi; + + + # ------------------------------------------------ # Bacula check for various SQL database engines # ------------------------------------------------ @@ -7042,6 +7322,14 @@ echo "$as_me: error: \"You can configure for only one database.\"" >&2;} POSTGRESQL_INCDIR=/usr/include POSTGRESQL_LIBDIR=/usr/lib POSTGRESQL_BINDIR=/usr/bin + elif test -f /usr/include/pgsql/libpq-fe.h; then + POSTGRESQL_INCDIR=/usr/include/pgsql + POSTGRESQL_LIBDIR=/usr/lib/pgsql + POSTGRESQL_BINDIR=/usr/bin + elif test -f /usr/include/postgresql/libpq-fe.h; then + POSTGRESQL_INCDIR=/usr/include/postgresql + POSTGRESQL_LIBDIR=/usr/lib/postgresql + POSTGRESQL_BINDIR=/usr/bin else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 @@ -7049,10 +7337,10 @@ echo "${ECHO_T}no" >&6 echo "$as_me: error: Unable to find libpq-fe.h in standard locations" >&2;} { (exit 1); exit 1; }; } fi - elif test -f $withval/libpq-fe.h; then - POSTGRESQL_INCDIR=$withval - POSTGRESQL_LIBDIR=$withval - POSTGRESQL_BINDIR=$withval + elif test -f $withval/include/libpq-fe.h; then + POSTGRESQL_INCDIR=$withval/include + POSTGRESQL_LIBDIR=$withval/lib + POSTGRESQL_BINDIR=$withval/bin else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 @@ -7309,10 +7597,6 @@ echo "${ECHO_T}yes" >&6 echo "${ECHO_T}no" >&6 fi -else - - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 fi; @@ -7391,10 +7675,6 @@ echo "${ECHO_T}yes" >&6 echo "${ECHO_T}no" >&6 fi -else - - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 fi; @@ -7415,52 +7695,60 @@ if test "${with_sqlite+set}" = set; then withval="$with_sqlite" if test "$withval" != "no"; then - if test "$withval" = "yes"; then - if test -f /usr/local/include/sqlite.h; then - SQLITE_INCDIR=/usr/local/include - SQLITE_LIBDIR=/usr/local/lib - SQLITE_BINDIR=/usr/local/bin - elif test -f /usr/include/sqlite.h; then - SQLITE_INCDIR=/usr/include - SQLITE_LIBDIR=/usr/lib - SQLITE_BINDIR=/usr/bin - else - echo "$as_me:$LINENO: result: no" >&5 + if test "$withval" = "yes"; then + if test -f /usr/local/include/sqlite.h; then + SQLITE_INCDIR=/usr/local/include + SQLITE_LIBDIR=/usr/local/lib + SQLITE_BINDIR=/usr/local/bin + elif test -f /usr/include/sqlite.h; then + SQLITE_INCDIR=/usr/include + SQLITE_LIBDIR=/usr/lib + SQLITE_BINDIR=/usr/bin + elif test -f $prefix/include/sqlite.h; then + SQLITE_INCDIR=$prefix/include + SQLITE_LIBDIR=$prefix/lib + SQLITE_BINDIR=$prefix/bin + else + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 - { { echo "$as_me:$LINENO: error: Unable to find sqlite.h in standard locations" >&5 + { { echo "$as_me:$LINENO: error: Unable to find sqlite.h in standard locations" >&5 echo "$as_me: error: Unable to find sqlite.h in standard locations" >&2;} { (exit 1); exit 1; }; } - fi + fi + else + if test -f $withval/sqlite.h; then + SQLITE_INCDIR=$withval + SQLITE_LIBDIR=$withval + SQLITE_BINDIR=$withval + elif test -f $withval/include/sqlite.h; then + SQLITE_INCDIR=$withval/include + SQLITE_LIBDIR=$withval/lib + SQLITE_BINDIR=$withval/bin else - if test -f $withval/sqlite.h; then - SQLITE_INCDIR=$withval - SQLITE_LIBDIR=$withval - SQLITE_BINDIR=$withval - else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 - { { echo "$as_me:$LINENO: error: Invalid SQLite directory $withval - unable to find sqlite.h under $withval" >&5 + { { echo "$as_me:$LINENO: error: Invalid SQLite directory $withval - unable to find sqlite.h under $withval" >&5 echo "$as_me: error: Invalid SQLite directory $withval - unable to find sqlite.h under $withval" >&2;} { (exit 1); exit 1; }; } - fi fi - SQL_INCLUDE=-I$SQLITE_INCDIR - SQL_LFLAGS="-L$SQLITE_LIBDIR -lsqlite" - SQL_BINDIR=$SQLITE_BINDIR + fi + SQL_INCLUDE=-I$SQLITE_INCDIR + SQL_LFLAGS="-L$SQLITE_LIBDIR -lsqlite" + SQL_BINDIR=$SQLITE_BINDIR - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_SQLITE 1 _ACEOF - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - db_found=yes - support_sqlite=yes - db_name=SQLite - DB_NAME=sqlite + db_found=yes + support_sqlite=yes + db_name=SQLite + DB_NAME=sqlite else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7484,9 +7772,9 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -if test -z "$CFLAGS"; then +if test -z "$CFLAGS" -o "$CFLAGS" = "-g -O2"; then if test -z "$CCOPTS"; then - CCOPTS='-g -O2' + CCOPTS='-g -O2 -Wall' fi CFLAGS="$CCOPTS" fi @@ -9013,6 +9301,10 @@ fi + + + + @@ -9030,7 +9322,9 @@ for ac_header in \ stdint.h \ string.h \ termios.h \ + termcap.h \ unistd.h \ + sys/bitypes.h \ sys/byteorder.h \ sys/ioctl.h \ sys/select.h \ @@ -9041,6 +9335,8 @@ for ac_header in \ resolv.h \ mtio.h \ sys/mtio.h \ + sys/tape.h \ + regex.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -14941,77 +15237,186 @@ _ACEOF fi fi - - - - - - - - - - - - - - -for ac_func in \ - fork \ - getcwd \ - gethostname \ - getpid \ - gettimeofday \ - setpgid \ - setpgrp \ - setsid \ - signal \ - strerror \ - strncmp \ - strncpy \ - vfprintf \ - -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF +if (test -z "$have_u_int64_t" || test -z "$have_int64_t" && \ + test "x$ac_cv_header_sys_bitypes_h" = "xyes") +then + echo "$as_me:$LINENO: checking for int64_t and u_int64_t types in sys/bitypes.h" >&5 +echo $ECHO_N "checking for int64_t and u_int64_t types in sys/bitypes.h... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" + #include +int +main () +{ + int64_t a; u_int64_t b; + a = b = 1; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_U_INT64_T 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_INT64_T 1 +_ACEOF + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi + +if (test -z "$have_uintxx_t" && \ + test "x$ac_cv_header_sys_bitypes_h" = "xyes") +then + echo "$as_me:$LINENO: checking for uintXX_t types in sys/bitypes.h" >&5 +echo $ECHO_N "checking for uintXX_t types in sys/bitypes.h... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + #include +int +main () +{ + uint8_t a; uint16_t b; + uint32_t c; a = b = c = 1; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_UINTXX_T 1 +_ACEOF + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi + + + + + + + + + + + + + + + + + +for ac_func in \ + fork \ + getcwd \ + gethostname \ + getpid \ + gettimeofday \ + setpgid \ + setpgrp \ + setsid \ + signal \ + strerror \ + strncmp \ + strncpy \ + vfprintf \ + +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" { #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif int main () @@ -15969,17 +16374,329 @@ _ACEOF LIBS="-linet $LIBS" fi - + +fi + + + +for ac_func in inet_pton +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF +#define HAVE_INET_PTON 1 +_ACEOF + +fi +done + + +for ac_func in inet_ntop +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF +#define HAVE_INET_NTOP 1 +_ACEOF + +fi +done + + +for ac_func in gethostbyname2 +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF +#define HAVE_GETHOSTBYNAME2 1 +_ACEOF + +fi +done + + +echo "$as_me:$LINENO: checking for struct sockaddr has a sa_len field" >&5 +echo $ECHO_N "checking for struct sockaddr has a sa_len field... $ECHO_C" >&6 +if test "${ac_cv_struct_sockaddr_sa_len+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +struct sockaddr s; s.sa_len; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_struct_sockaddr_sa_len=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_struct_sockaddr_sa_len=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:$LINENO: result: $ac_cv_struct_sockaddr_sa_len" >&5 +echo "${ECHO_T}$ac_cv_struct_sockaddr_sa_len" >&6 + if test $ac_cv_struct_sockaddr_sa_len = yes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_SA_LEN 1 +_ACEOF -for ac_func in inet_pton -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then + fi + + +echo "$as_me:$LINENO: checking for IPv6 support" >&5 +echo $ECHO_N "checking for IPv6 support... $ECHO_C" >&6 +if test "${ac_cv_ipv6_support+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -15989,39 +16706,14 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - + #include +#include +#include int main () { -return f != $ac_func; +struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = + 0; ; return 0; } @@ -16038,27 +16730,26 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + ac_cv_ipv6_support=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" +ac_cv_ipv6_support=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_INET_PTON 1 +echo "$as_me:$LINENO: result: $ac_cv_ipv6_support" >&5 +echo "${ECHO_T}$ac_cv_ipv6_support" >&6 + +if test "$ac_cv_ipv6_support" = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_IPV6 1 _ACEOF fi -done + @@ -17494,6 +18185,204 @@ _ACEOF have_zlib=yes fi +if test "${ac_cv_header_sys_acl_h+set}" = set; then + echo "$as_me:$LINENO: checking for sys/acl.h" >&5 +echo $ECHO_N "checking for sys/acl.h... $ECHO_C" >&6 +if test "${ac_cv_header_sys_acl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_sys_acl_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_acl_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking sys/acl.h usability" >&5 +echo $ECHO_N "checking sys/acl.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking sys/acl.h presence" >&5 +echo $ECHO_N "checking sys/acl.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: sys/acl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sys/acl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/acl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sys/acl.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; + no:yes ) + { echo "$as_me:$LINENO: WARNING: sys/acl.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sys/acl.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/acl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sys/acl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/acl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sys/acl.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for sys/acl.h" >&5 +echo $ECHO_N "checking for sys/acl.h... $ECHO_C" >&6 +if test "${ac_cv_header_sys_acl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_sys_acl_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_sys_acl_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_acl_h" >&6 + +fi + + +echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5 +echo $ECHO_N "checking for acl_get_file in -lacl... $ECHO_C" >&6 +if test "${ac_cv_lib_acl_acl_get_file+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lacl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char acl_get_file (); +int +main () +{ +acl_get_file (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_acl_acl_get_file=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_acl_acl_get_file=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5 +echo "${ECHO_T}$ac_cv_lib_acl_acl_get_file" >&6 +if test $ac_cv_lib_acl_acl_get_file = yes; then + FDLIBS="-lacl $FDLIBS" +fi + +have_acl=no +if test $ac_cv_lib_acl_acl_get_file = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_ACL 1 +_ACEOF + + have_acl=yes +fi + PTHREAD_LIB="" echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 @@ -17792,7 +18681,8 @@ WLDFLAGS= PFILES="platforms/Makefile" PSCMD="ps -e" WIN32= -hostname=`uname -n` +MACOSX= +hostname=`uname -n | cut -d '.' -f 1` case "$DISTNAME" in aix) DISTVER=`uname -r` @@ -17826,7 +18716,6 @@ bsdi) platforms/bsdi/bacula-fd \ platforms/bsdi/bacula-sd \ platforms/bsdi/bacula-dir" - hostname=`hostname -s` largefile_support="yes" ;; cygwin) @@ -17840,7 +18729,7 @@ darwin) DISTVER=`uname -r` TAPEDRIVE="/dev/nst0" PSCMD="ps -e -o pid,command" - hostname=`hostname -s` + MACOSX=macosx PFILES="${PFILES} \ platforms/darwin/Makefile" ;; @@ -17848,7 +18737,6 @@ debian) DISTVER=`cat /etc/debian_version` TAPEDRIVE="/dev/nrst0" PSCMD="ps -e -o pid,command" - hostname=`hostname -s` ;; freebsd) DISTVER=`uname -a |awk '{print $3}'` @@ -17866,10 +18754,11 @@ freebsd) platforms/freebsd/bacula-fd \ platforms/freebsd/bacula-sd \ platforms/freebsd/bacula-dir" - hostname=`hostname -s` largefile_support="yes" ;; hpux) + PSCMD="UNIX95=1 ps -e -o pid,comm" + CFLAGS="$(CFLAGS) -D_XOPEN_SOURCE_EXTENDED=1" DISTVER=`uname -r` TAPEDRIVE="/dev/rmt/0hnb" ;; @@ -17907,9 +18796,14 @@ openbsd) platforms/openbsd/bacula-dir" ;; redhat) - if test `cat /etc/redhat-release | grep release |\ + if test -f /etc/whitebox-release ; then + f=/etc/whitebox-release + else + f=/etc/redhat-release + fi + if test `cat $f | grep release |\ cut -f 3 -d ' '`x = "Enterprise"x ; then - DISTVER="Enterprise "`cat /etc/redhat-release | grep release |\ + DISTVER="Enterprise "`cat $f | grep release |\ cut -f 6 -d ' '` else DISTVER=`cat /etc/redhat-release | grep release |\ @@ -17938,7 +18832,6 @@ mandrake) platforms/mandrake/bacula-dir \ platforms/mandrake/bacula.spec \ " - hostname=`hostname -s` ;; gentoo) DISTVER=`awk '/version / {print $5}' < /etc/gentoo-release` @@ -17949,14 +18842,17 @@ gentoo) platforms/gentoo/bacula-fd \ platforms/gentoo/bacula-sd \ platforms/gentoo/bacula-dir" - hostname=`hostname -s` ;; - slackware) DISTVER=`cat /etc/slackware-version` TAPEDRIVE="/dev/nst0" PSCMD="ps -e -o pid,command" - hostname=`hostname -s` + PFILES="${PFILES} \ + platforms/slackware/Makefile \ + platforms/slackware/rc.bacula-fd \ + platforms/slackware/rc.bacula-sd \ + platforms/slackware/rc.bacula-dir\ + platforms/slackware/functions.bacula" ;; solaris) DISTVER=`uname -r` @@ -17979,19 +18875,19 @@ suse) cut -f 3 -d ' '` TAPEDRIVE="/dev/nst0" PSCMD="ps -e -o pid,command" - hostname=`hostname -s` PFILES="${PFILES} \ platforms/suse/Makefile \ platforms/suse/bacula-fd \ platforms/suse/bacula-sd \ - platforms/suse/bacula-dir" + platforms/suse/bacula-dir \ + platforms/suse/bacula \ + platforms/suse/bacula.spec" ;; suse5) DISTNAME=suse DISTVER=5.x TAPEDRIVE="/dev/nst0" PSCMD="ps -e -o pid,command" - hostname=`hostname -s` PFILES="${PFILES} \ platforms/suse/Makefile \ platforms/suse/bacula-fd \ @@ -18025,6 +18921,7 @@ _ACEOF + MCOMMON=./autoconf/Make.common @@ -18041,7 +18938,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi - ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/fd scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/tconsole/Makefile src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile $PFILES" + ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/linux/floppy/Makefile rescue/linux/cdrom/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf src/win32/wx-console/wx-console.conf $PFILES" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -18574,6 +19471,8 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "rescue/Makefile" ) CONFIG_FILES="$CONFIG_FILES rescue/Makefile" ;; "rescue/linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES rescue/linux/Makefile" ;; + "rescue/linux/floppy/Makefile" ) CONFIG_FILES="$CONFIG_FILES rescue/linux/floppy/Makefile" ;; + "rescue/linux/cdrom/Makefile" ) CONFIG_FILES="$CONFIG_FILES rescue/linux/cdrom/Makefile" ;; "rescue/freebsd/Makefile" ) CONFIG_FILES="$CONFIG_FILES rescue/freebsd/Makefile" ;; "rescue/solaris/Makefile" ) CONFIG_FILES="$CONFIG_FILES rescue/solaris/Makefile" ;; "scripts/startmysql" ) CONFIG_FILES="$CONFIG_FILES scripts/startmysql" ;; @@ -18584,11 +19483,16 @@ do "scripts/bconsole" ) CONFIG_FILES="$CONFIG_FILES scripts/bconsole" ;; "scripts/gconsole" ) CONFIG_FILES="$CONFIG_FILES scripts/gconsole" ;; "scripts/bacula" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula" ;; - "scripts/fd" ) CONFIG_FILES="$CONFIG_FILES scripts/fd" ;; + "scripts/devel_bacula" ) CONFIG_FILES="$CONFIG_FILES scripts/devel_bacula" ;; "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; "scripts/logrotate" ) CONFIG_FILES="$CONFIG_FILES scripts/logrotate" ;; "scripts/bacula.desktop.gnome1" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome1" ;; "scripts/bacula.desktop.gnome2" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome2" ;; + "scripts/bacula.desktop.gnome1.consolehelper" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome1.consolehelper" ;; + "scripts/bacula.desktop.gnome2.consolehelper" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome2.consolehelper" ;; + "scripts/bacula.desktop.gnome1.xsu" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome1.xsu" ;; + "scripts/bacula.desktop.gnome2.xsu" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome2.xsu" ;; + "scripts/gnome-console.console_apps" ) CONFIG_FILES="$CONFIG_FILES scripts/gnome-console.console_apps" ;; "scripts/mtx-changer" ) CONFIG_FILES="$CONFIG_FILES scripts/mtx-changer" ;; "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; @@ -18599,7 +19503,10 @@ do "src/gnome-console/gnome-console.conf" ) CONFIG_FILES="$CONFIG_FILES src/gnome-console/gnome-console.conf" ;; "src/gnome2-console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gnome2-console/Makefile" ;; "src/gnome2-console/gnome-console.conf" ) CONFIG_FILES="$CONFIG_FILES src/gnome2-console/gnome-console.conf" ;; - "src/tconsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/tconsole/Makefile" ;; + "src/wx-console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/wx-console/Makefile" ;; + "src/wx-console/wx-console.conf" ) CONFIG_FILES="$CONFIG_FILES src/wx-console/wx-console.conf" ;; + "src/tray-monitor/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/tray-monitor/Makefile" ;; + "src/tray-monitor/tray-monitor.conf" ) CONFIG_FILES="$CONFIG_FILES src/tray-monitor/tray-monitor.conf" ;; "src/dird/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/dird/Makefile" ;; "src/dird/bacula-dir.conf" ) CONFIG_FILES="$CONFIG_FILES src/dird/bacula-dir.conf" ;; "src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;; @@ -18645,6 +19552,11 @@ do "src/cats/drop_bacula_database" ) CONFIG_FILES="$CONFIG_FILES src/cats/drop_bacula_database" ;; "src/findlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/findlib/Makefile" ;; "src/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/tools/Makefile" ;; + "src/win32/winbacula.nsi" ) CONFIG_FILES="$CONFIG_FILES src/win32/winbacula.nsi" ;; + "src/win32/baculafd/bacula-fd.conf" ) CONFIG_FILES="$CONFIG_FILES src/win32/baculafd/bacula-fd.conf" ;; + "src/win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/win32/Makefile" ;; + "src/win32/console/bconsole.conf" ) CONFIG_FILES="$CONFIG_FILES src/win32/console/bconsole.conf" ;; + "src/win32/wx-console/wx-console.conf" ) CONFIG_FILES="$CONFIG_FILES src/win32/wx-console/wx-console.conf" ;; "$PFILES" ) CONFIG_FILES="$CONFIG_FILES $PFILES" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:autoconf/config.h.in" ;; @@ -18736,14 +19648,6 @@ s,@LIBS@,$LIBS,;t t s,@BUILD_DIR@,$BUILD_DIR,;t t s,@TRUEPRG@,$TRUEPRG,;t t s,@FALSEPRG@,$FALSEPRG,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t s,@VERSION@,$VERSION,;t t s,@DATE@,$DATE,;t t s,@LSMDATE@,$LSMDATE,;t t @@ -18776,12 +19680,22 @@ s,@AR@,$AR,;t t s,@OPENSSL@,$OPENSSL,;t t s,@MTX@,$MTX,;t t s,@PKGCONFIG@,$PKGCONFIG,;t t +s,@WXCONFIG@,$WXCONFIG,;t t +s,@CDRECORD@,$CDRECORD,;t t s,@ARFLAGS@,$ARFLAGS,;t t s,@MAKE_SHELL@,$MAKE_SHELL,;t t s,@LOCAL_LIBS@,$LOCAL_LIBS,;t t s,@LOCAL_CFLAGS@,$LOCAL_CFLAGS,;t t s,@LOCAL_LDFLAGS@,$LOCAL_LDFLAGS,;t t s,@LOCAL_DEFS@,$LOCAL_DEFS,;t t +s,@build@,$build,;t t +s,@build_cpu@,$build_cpu,;t t +s,@build_vendor@,$build_vendor,;t t +s,@build_os@,$build_os,;t t +s,@host@,$host,;t t +s,@host_cpu@,$host_cpu,;t t +s,@host_vendor@,$host_vendor,;t t +s,@host_os@,$host_os,;t t s,@HAVE_SUN_OS_TRUE@,$HAVE_SUN_OS_TRUE,;t t s,@HAVE_SUN_OS_FALSE@,$HAVE_SUN_OS_FALSE,;t t s,@HAVE_OSF1_OS_TRUE@,$HAVE_OSF1_OS_TRUE,;t t @@ -18831,12 +19745,19 @@ s,@GNOME_APPLETS_LIBS@,$GNOME_APPLETS_LIBS,;t t s,@GNOME_DOCKLETS_LIBS@,$GNOME_DOCKLETS_LIBS,;t t s,@GNOME_CAPPLET_LIBS@,$GNOME_CAPPLET_LIBS,;t t s,@GNOME_DIR@,$GNOME_DIR,;t t +s,@WXCONS_CPPFLAGS@,$WXCONS_CPPFLAGS,;t t +s,@WXCONS_LDFLAGS@,$WXCONS_LDFLAGS,;t t +s,@WX_DIR@,$WX_DIR,;t t +s,@TRAY_MONITOR_CPPFLAGS@,$TRAY_MONITOR_CPPFLAGS,;t t +s,@TRAY_MONITOR_LDFLAGS@,$TRAY_MONITOR_LDFLAGS,;t t +s,@TRAY_MONITOR_DIR@,$TRAY_MONITOR_DIR,;t t s,@TTOOL_LDFLAGS@,$TTOOL_LDFLAGS,;t t s,@STATIC_FD@,$STATIC_FD,;t t s,@STATIC_SD@,$STATIC_SD,;t t s,@STATIC_DIR@,$STATIC_DIR,;t t s,@STATIC_CONS@,$STATIC_CONS,;t t s,@STATIC_GNOME_CONS@,$STATIC_GNOME_CONS,;t t +s,@STATIC_WX_CONS@,$STATIC_WX_CONS,;t t s,@ALL_DIRS@,$ALL_DIRS,;t t s,@CONS_INC@,$CONS_INC,;t t s,@CONS_OBJ@,$CONS_OBJ,;t t @@ -18844,6 +19765,7 @@ s,@CONS_SRC@,$CONS_SRC,;t t s,@CONS_LIBS@,$CONS_LIBS,;t t s,@CONS_LDFLAGS@,$CONS_LDFLAGS,;t t s,@READLINE_SRC@,$READLINE_SRC,;t t +s,@CDSTL@,$CDSTL,;t t s,@working_dir@,$working_dir,;t t s,@scriptdir@,$scriptdir,;t t s,@dump_email@,$dump_email,;t t @@ -18858,12 +19780,16 @@ s,@sd_port@,$sd_port,;t t s,@dir_password@,$dir_password,;t t s,@fd_password@,$fd_password,;t t s,@sd_password@,$sd_password,;t t +s,@mon_dir_password@,$mon_dir_password,;t t +s,@mon_fd_password@,$mon_fd_password,;t t +s,@mon_sd_password@,$mon_sd_password,;t t s,@dir_user@,$dir_user,;t t s,@dir_group@,$dir_group,;t t s,@sd_user@,$sd_user,;t t s,@sd_group@,$sd_group,;t t s,@fd_user@,$fd_user,;t t s,@fd_group@,$fd_group,;t t +s,@SBINPERM@,$SBINPERM,;t t s,@SQL_LFLAGS@,$SQL_LFLAGS,;t t s,@SQL_INCLUDE@,$SQL_INCLUDE,;t t s,@SQL_BINDIR@,$SQL_BINDIR,;t t @@ -18889,6 +19815,7 @@ s,@hostname@,$hostname,;t t s,@TAPEDRIVE@,$TAPEDRIVE,;t t s,@PSCMD@,$PSCMD,;t t s,@WIN32@,$WIN32,;t t +s,@MACOSX@,$MACOSX,;t t s,@DISTNAME@,$DISTNAME,;t t s,@DISTVER@,$DISTVER,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t @@ -19377,7 +20304,7 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in - default ) (echo "Doing make of dependencies"; make depend;) + default ) (echo "Doing make of dependencies"; ${MAKE:-make} depend;) ;; esac done @@ -19415,7 +20342,7 @@ fi cd scripts chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer -chmod 755 bconsole gconsole mtx-changer +chmod 755 bconsole gconsole mtx-changer devel_bacula logrotate cd .. c=src/cats @@ -19462,12 +20389,26 @@ if test "x${subsysdir}" = "x${sbindir}" ; then echo "You have set --sbindir and --with-subsys-dir" echo " both equal to: ${subsysdir} " echo " This is not permitted. Please reconfigure." + echo " " echo "Aborting configuration ..." echo " " echo " " exit 1 fi +if test "x${db_name}" = "xInternal" ; then + echo " " + echo " " + echo "You have not specified either --enable-client-only or one of the" + echo " supported databases: MySQL, PostgreSQL, or SQLite". + echo " This is not permitted. Please reconfigure." + echo " " + echo "Aborting the configuration ..." + echo " " + echo " " + exit 1 +fi + echo " Configuration on `date`: @@ -19503,10 +20444,10 @@ Configuration on `date`: Director User: ${dir_user} Director Group: ${dir_group} - Storage Daemon User: ${dir_user} - Storage DaemonGroup: ${dir_group} - File Daemon User: ${dir_user} - File Daemon Group: ${dir_group} + Storage Daemon User: ${sd_user} + Storage DaemonGroup: ${sd_group} + File Daemon User: ${fd_user} + File Daemon Group: ${fd_group} SQL binaries Directory ${SQL_BINDIR} @@ -19517,7 +20458,10 @@ Configuration on `date`: ZLIB support: ${have_zlib} enable-smartalloc: ${support_smartalloc} enable-gnome: ${support_gnome} ${gnome_version} + enable-wx-console: ${support_wx_console} + enable-tray-monitor: ${support_tray_monitor} client-only: ${build_client_only} + ACL support: ${have_acl} " > config.out @@ -19525,4 +20469,4 @@ cat config.out # old stuff # cweb support: ${got_cweb} ${CWEB_SRC} -# gmp support: ${got_gmp} ${GMP_SRC} + # gmp support: ${got_gmp} ${GMP_SRC}