X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=01a0bcdbaff741783a45d9bc22c5c05e2eb9a64a;hb=62f7ce325311d3c82b243249f4cab1fad10d067d;hp=e10b62c62fe25bb48286dc8a078543f6ad23d452;hpb=5de896ed3f6adb7a4571f40d58ff7851d0e65595;p=bacula%2Fbacula diff --git a/bacula/configure b/bacula/configure index e10b62c62f..01a0bcdbaf 100755 --- a/bacula/configure +++ b/bacula/configure @@ -309,7 +309,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 TOP_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 ECHO CMP TBL AR OPENSSL MTX DD MKISOFS PYTHON GROWISOFS DVDRWMEDIAINFO DVDRWFORMAT PKGCONFIG WXCONFIG WXFLAGS CDRECORD PIDOF AWK 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 SET_MAKE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GLIBC2 ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOME_DIR BAT_DIR QWT_INC QWT_LDFLAGS 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 DIRD_DIR DIR_TOOLS STORED_DIR CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC PYTHON_LIBS PYTHON_INCDIR OPENSSL_LIBS OPENSSL_INC 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 db_name db_user dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_TYPE GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS WRAPLIBS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX 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 TOP_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 ECHO CMP TBL AR OPENSSL MTX DD MKISOFS PYTHON GROWISOFS DVDRWMEDIAINFO DVDRWFORMAT PKGCONFIG QMAKE QMAKEQT4 WXCONFIG WXFLAGS CDRECORD PIDOF AWK 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 SET_MAKE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GLIBC2 ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOME_DIR BAT_DIR QWT_INC QWT_LDFLAGS 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 DIRD_DIR DIR_TOOLS STORED_DIR CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC PYTHON_LIBS PYTHON_INCDIR OPENSSL_LIBS OPENSSL_INC working_dir archivedir 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 db_name db_user dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_TYPE GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS WRAPLIBS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS' ac_subst_files='MCOMMON' # Initialize some variables set by options. @@ -907,6 +907,7 @@ Optional Packages: --with-openssl[=DIR] Include OpenSSL support. DIR is the OpenSSL base --with-working-dir=PATH specify path of Bacula working directory + --with-archivedir=PATH specify path of SD archive directory --with-scriptdir=PATH specify path of Bacula scripts directory --with-dump-email=EMAIL dump email address --with-job-email=EMAIL job output email address @@ -1529,7 +1530,6 @@ done test -n "$FALSEPRG" || FALSEPRG=":" -#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` @@ -4107,6 +4107,86 @@ else echo "${ECHO_T}no" >&6 fi +# Extract the first word of "qmake", so it can be a program name with args. +set dummy qmake; 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_QMAKE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $QMAKE in + [\\/]* | ?:[\\/]*) + ac_cv_path_QMAKE="$QMAKE" # 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_QMAKE="$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_QMAKE" && ac_cv_path_QMAKE="none" + ;; +esac +fi +QMAKE=$ac_cv_path_QMAKE + +if test -n "$QMAKE"; then + echo "$as_me:$LINENO: result: $QMAKE" >&5 +echo "${ECHO_T}$QMAKE" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +# Extract the first word of "qmake-qt4", so it can be a program name with args. +set dummy qmake-qt4; 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_QMAKEQT4+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $QMAKEQT4 in + [\\/]* | ?:[\\/]*) + ac_cv_path_QMAKEQT4="$QMAKEQT4" # 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_QMAKEQT4="$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_QMAKEQT4" && ac_cv_path_QMAKEQT4="none" + ;; +esac +fi +QMAKEQT4=$ac_cv_path_QMAKEQT4 + +if test -n "$QMAKEQT4"; then + echo "$as_me:$LINENO: result: $QMAKEQT4" >&5 +echo "${ECHO_T}$QMAKEQT4" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + if test "x$WXCONFIG" = x; then WXCONFIG=wx-config @@ -4330,6 +4410,7 @@ echo "${ECHO_T}no" >&6 fi + test -n "$ARFLAG" || ARFLAGS="cr" @@ -4412,7 +4493,7 @@ else HAVE_SUN_OS_TRUE='#' HAVE_SUN_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_SUN_OS 1 _ACEOF @@ -4439,7 +4520,7 @@ else HAVE_OSF1_OS_TRUE='#' HAVE_OSF1_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_OSF1_OS 1 _ACEOF @@ -4466,7 +4547,7 @@ else HAVE_AIX_OS_TRUE='#' HAVE_AIX_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_AIX_OS 1 _ACEOF @@ -4493,7 +4574,7 @@ else HAVE_HPUX_OS_TRUE='#' HAVE_HPUX_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_HPUX_OS 1 _ACEOF @@ -4520,7 +4601,7 @@ else HAVE_LINUX_OS_TRUE='#' HAVE_LINUX_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_LINUX_OS 1 _ACEOF @@ -4547,7 +4628,7 @@ else HAVE_FREEBSD_OS_TRUE='#' HAVE_FREEBSD_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_FREEBSD_OS 1 _ACEOF @@ -4574,7 +4655,7 @@ else HAVE_NETBSD_OS_TRUE='#' HAVE_NETBSD_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_NETBSD_OS 1 _ACEOF @@ -4601,7 +4682,7 @@ else HAVE_OPENBSD_OS_TRUE='#' HAVE_OPENBSD_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_OPENBSD_OS 1 _ACEOF @@ -4628,7 +4709,7 @@ else HAVE_BSDI_OS_TRUE='#' HAVE_BSDI_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_BSDI_OS 1 _ACEOF @@ -4655,7 +4736,7 @@ else HAVE_SGI_OS_TRUE='#' HAVE_SGI_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_SGI_OS 1 _ACEOF @@ -4682,7 +4763,7 @@ else HAVE_IRIX_OS_TRUE='#' HAVE_IRIX_OS_FALSE= fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_IRIX_OS 1 _ACEOF @@ -4735,70 +4816,70 @@ then echo "distname set to $DISTNAME" elif test $HAVE_UNAME=yes -a x`uname -s` = xOSF1 then - DISTNAME=alpha + DISTNAME=alpha elif test $HAVE_UNAME=yes -a x`uname -s` = xAIX then - DISTNAME=aix + DISTNAME=aix elif test $HAVE_UNAME=yes -a x`uname -s` = xHP-UX then - DISTNAME=hpux + DISTNAME=hpux elif test $HAVE_UNAME=yes -a x`uname -s` = xSunOS then - DISTNAME=solaris + DISTNAME=solaris elif test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD then - DISTNAME=freebsd + DISTNAME=freebsd elif test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD then - DISTNAME=netbsd + DISTNAME=netbsd elif test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD then - DISTNAME=openbsd + DISTNAME=openbsd elif test $HAVE_UNAME=yes -a x`uname -s` = xIRIX then - DISTNAME=irix + DISTNAME=irix elif test $HAVE_UNAME=yes -a x`uname -s` = xBSD/OS then - DISTNAME=bsdi + DISTNAME=bsdi elif test -f /etc/SuSE-release then - DISTNAME=suse + DISTNAME=suse elif test -d /etc/SuSEconfig then - DISTNAME=suse5 + DISTNAME=suse5 elif test -f /etc/mandrake-release then - DISTNAME=mandrake + DISTNAME=mandrake elif test -f /etc/whitebox-release then DISTNAME=redhat elif test -f /etc/redhat-release then - DISTNAME=redhat + DISTNAME=redhat elif test -f /etc/gentoo-release then - DISTNAME=gentoo + DISTNAME=gentoo elif test -f /etc/debian_version then - DISTNAME=debian + DISTNAME=debian elif test -f /etc/slackware-version then - DISTNAME=slackware + DISTNAME=slackware elif test $HAVE_UNAME=yes -a x`uname -s` = xDarwin then DISTNAME=darwin elif test -f /etc/engarde-version then - DISTNAME=engarde + DISTNAME=engarde elif test "$CYGWIN" = yes then - DISTNAME=cygwin - cat >>confdefs.h <<\_ACEOF + DISTNAME=cygwin + cat >>confdefs.h <<\_ACEOF #define HAVE_CYGWIN 1 _ACEOF else - DISTNAME=unknown + DISTNAME=unknown fi echo "$as_me:$LINENO: result: done" >&5 echo "${ECHO_T}done" >&6 @@ -6763,6 +6844,7 @@ if test x$sbindir = x'${exec_prefix}/sbin' ; then fi sbindir=`eval echo ${sbindir}` + # ------------------------------------------------------------------------- # If the user has not set --mandir, we default to /usr/share/man # ------------------------------------------------------------------------- @@ -6771,12 +6853,6 @@ if test x$mandir = x'${prefix}/man' ; then fi -# ------------------------------------------------------------------ -# All list of languages for which a translation exist. Each -# language is separated by a space. -# ------------------------------------------------------------------ -ALL_LINGUAS="" - for ac_prog in msgfmt do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -12842,7 +12918,7 @@ fi; # if test x$QWT_INC = x; then for root in /usr /usr/local; do - for ver in qwt qwt5; do + for ver in qwt qwt5 qwt-qt4; do if test -f ${root}/include/${ver}/qwt.h; then QWT_INC="${root}/include/${ver}" if test -d ${root}/lib64/; then @@ -12932,7 +13008,8 @@ if test x$support_tray_monitor = xyes; then abc=`$PKGCONFIG --atleast-version=2.4 gtk+-2.0` pkg=$? if test $pkg = 0; then - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_GTK_2_4 1 _ACEOF @@ -12953,7 +13030,8 @@ if test "${enable_smartalloc+set}" = set; then fi; if test x$support_smartalloc = xyes; then - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define SMARTALLOC 1 _ACEOF @@ -13961,7 +14039,8 @@ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_READLINE 1 _ACEOF @@ -14121,7 +14200,8 @@ echo "${ECHO_T}$ac_cv_header__usr_include_readline_readline_h" >&6 fi if test $ac_cv_header__usr_include_readline_readline_h = yes; then - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_READLINE 1 _ACEOF @@ -14271,7 +14351,8 @@ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_READLINE 1 _ACEOF @@ -15870,7 +15951,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_LIBWRAP 1 _ACEOF @@ -15929,7 +16011,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_LIBWRAP 1 _ACEOF @@ -16334,6 +16417,25 @@ fi; +# ------------------------------------------------------------------ +# If the user has not set archivedir, we set our default as /tmp +# ------------------------------------------------------------------ +archive_dir=/tmp + +# Check whether --with-archivedir or --without-archivedir was given. +if test "${with_archivedir+set}" = set; then + withval="$with_archivedir" + + if test "x$withval" != "xno" ; then + archivedir=$withval + fi + + +fi; + + + + # ------------------------------------------ # Where to place scriptdir (script files) @@ -17502,6 +17604,15 @@ if test "${enable_batch_insert+set}" = set; then fi; fi +# Check if postgresql support batch mode +if test x$DB_TYPE = xpostgresql; then + A=`nm $SQL_LIB | grep PQputCopyData` + pkg=$? + if test $pkg != 0; then + support_batch_insert=no + fi +fi + if test $support_batch_insert = yes ; then cat >>confdefs.h <<\_ACEOF @@ -19241,6 +19352,9 @@ fi + + + @@ -19256,6 +19370,7 @@ for ac_header in \ stdlib.h \ stdint.h \ string.h \ + strings.h \ termios.h \ termcap.h \ term.h \ @@ -19264,9 +19379,11 @@ for ac_header in \ sys/byteorder.h \ sys/ioctl.h \ sys/select.h \ + sys/socket.h \ sys/sockio.h \ + sys/stat.h \ sys/time.h \ - sys/socket.h \ + sys/types.h \ arpa/nameser.h \ resolv.h \ mtio.h \ @@ -21015,7 +21132,8 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ba_cv_header_utime_h" >&5 echo "${ECHO_T}$ba_cv_header_utime_h" >&6 -test $ba_cv_header_utime_h = yes && cat >>confdefs.h <<\_ACEOF +test $ba_cv_header_utime_h = yes && +cat >>confdefs.h <<\_ACEOF #define HAVE_UTIME_H 1 _ACEOF @@ -21802,8 +21920,8 @@ int main () { - int mask = sigmask(SIGINT); - sigsetmask(mask); sigblock(mask); sigpause(mask); + int mask = sigmask(SIGINT); + sigsetmask(mask); sigblock(mask); sigpause(mask); ; return 0; @@ -21837,22 +21955,22 @@ else sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - RETSIGTYPE foo() { } + #include + RETSIGTYPE foo() { } int main () { - int mask = sigmask(SIGINT); - sigset(SIGINT, foo); sigrelse(SIGINT); - sighold(SIGINT); sigpause(SIGINT); + int mask = sigmask(SIGINT); + sigset(SIGINT, foo); sigrelse(SIGINT); + sighold(SIGINT); sigpause(SIGINT); ; return 0; @@ -27080,6 +27198,71 @@ fi done +echo "$as_me:$LINENO: checking for va_copy" >&5 +echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 +if test "${ba_cv_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +void use_va_copy(va_list args){va_list args2; va_copy(args2,args); va_end(args2);} +void call_use_va_copy(int junk,...){va_list args; va_start(args,junk); use_va_copy(args); va_end(args);} + +int +main () +{ +call_use_va_copy(1,2,3) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 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); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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 + ba_cv_va_copy=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ba_cv_va_copy=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ba_cv_va_copy" >&5 +echo "${ECHO_T}$ba_cv_va_copy" >&6 +test $ba_cv_va_copy = yes && +cat >>confdefs.h <<\_ACEOF +#define HAVE_VA_COPY 1 +_ACEOF + + + @@ -31138,6 +31321,8 @@ s,@GROWISOFS@,$GROWISOFS,;t t s,@DVDRWMEDIAINFO@,$DVDRWMEDIAINFO,;t t s,@DVDRWFORMAT@,$DVDRWFORMAT,;t t s,@PKGCONFIG@,$PKGCONFIG,;t t +s,@QMAKE@,$QMAKE,;t t +s,@QMAKEQT4@,$QMAKEQT4,;t t s,@WXCONFIG@,$WXCONFIG,;t t s,@WXFLAGS@,$WXFLAGS,;t t s,@CDRECORD@,$CDRECORD,;t t @@ -31247,6 +31432,7 @@ s,@PYTHON_INCDIR@,$PYTHON_INCDIR,;t t s,@OPENSSL_LIBS@,$OPENSSL_LIBS,;t t s,@OPENSSL_INC@,$OPENSSL_INC,;t t s,@working_dir@,$working_dir,;t t +s,@archivedir@,$archivedir,;t t s,@scriptdir@,$scriptdir,;t t s,@dump_email@,$dump_email,;t t s,@job_email@,$job_email,;t t @@ -31990,7 +32176,7 @@ echo "$as_me: executing $ac_dest commands" >&6;} ;; esac done ;; - default ) (echo "Doing make of dependencies"; ${MAKE:-make} depend;) + default ) ;; esac done @@ -32026,6 +32212,30 @@ if test "$no_create" != yes; then fi +if test "${support_bat}" = "yes" ; then + if test "x$QMAKE" = "xnone" && test "x$QMAKEQT4" = "xnone"; then + echo "Could not find qmake or qmake-qt4 in $PATH. Check your Qt installation" + exit 1 + fi + + QMAKEBIN="qmake" + + if test "x$QMAKEQT4" != "xnone"; then + QMAKEBIN=qmake-qt4 + fi + + + + cd src/qt-console + chmod 755 install_conf_file build-depkgs-qt-console + echo "Creating bat Makefile" + $QMAKEBIN + cd ${BUILD_DIR} +fi + +echo "Doing make of dependencies" +${MAKE:-make} depend + cd scripts chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer chmod 755 dvd-handler dvd-simulator @@ -32058,13 +32268,6 @@ chmod 755 $c/mysql chmod 755 src/win32/build-depkgs-mingw32 -if test "${support_bat}" = "yes" ; then - cd src/qt-console - chmod 755 install_conf_file build-depkgs-qt-console - echo "Creating bat Makefile" - qmake - cd ${BUILD_DIR} -fi if test "x$ac_cv_sys_largefile_CFLAGS" != "xno" ; then @@ -32119,6 +32322,7 @@ Configuration on `date`: Install binaries: ${sbindir} Install config files: ${sysconfdir} Scripts directory: ${scriptdir} + Archive directory: ${archivedir} Working directory: ${working_dir} PID directory: ${piddir} Subsys directory: ${subsysdir}