X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=8ae8e33442e3b99343834095f28ae049e67ad2bf;hb=df77ca2a09c9d863eacad8710c337f9939ed7f46;hp=e476645341fe42d6504b6bbabc39fe66a7e3facd;hpb=dca77d9ec55e8d2e07241baeb63d6c2e028ab552;p=bacula%2Fbacula diff --git a/bacula/configure b/bacula/configure index e476645341..8ae8e33442 100755 --- a/bacula/configure +++ b/bacula/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for bacula 7.2.0. +# Generated by GNU Autoconf 2.69 for bacula 9.0.6. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='bacula' PACKAGE_TARNAME='bacula' -PACKAGE_VERSION='7.2.0' -PACKAGE_STRING='bacula 7.2.0' +PACKAGE_VERSION='9.0.6' +PACKAGE_STRING='bacula 9.0.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -653,6 +653,8 @@ LZO_INC AFS_LIBS AFS_CFLAGS ZLIBS +S3_LIBS +S3_INC LIBOBJS X_EXTRA_LIBS X_LIBS @@ -681,6 +683,7 @@ sd_group sd_user dir_group dir_user +db_ssl_options db_port db_password db_user @@ -760,6 +763,8 @@ MSGFMT USE_NLS MKINSTALLDIRS SET_MAKE +HAVE_KFREEBSD_OS_FALSE +HAVE_KFREEBSD_OS_TRUE HAVE_DARWIN_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_IRIX_OS_FALSE @@ -877,7 +882,10 @@ LIBBACCATS_LT_RELEASE LIBBACSQL_LT_RELEASE LIBBACCFG_LT_RELEASE LIBBAC_LT_RELEASE -BQT4_VERSION +LIBRSYNC_VERSION +NDMP_VERSION +JAVA_VERSION +VIX_VERSION DEPKGS_VERSION DEPKGS_QT_VERSION BDB_VERSION @@ -909,6 +917,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -986,6 +995,7 @@ with_db_name with_db_user with_db_password with_db_port +with_db_ssl_options with_dir_user with_dir_group with_sd_user @@ -1000,6 +1010,7 @@ with_embedded_mysql with_sqlite3 enable_largefile with_x +with_s3 enable_afs with_afsdir enable_lzo @@ -1060,6 +1071,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1312,6 +1324,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1449,7 +1470,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1562,7 +1583,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures bacula 7.2.0 to adapt to many kinds of systems. +\`configure' configures bacula 9.0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1602,6 +1623,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1631,7 +1653,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bacula 7.2.0:";; + short | recursive ) echo "Configuration of bacula 9.0.6:";; esac cat <<\_ACEOF @@ -1648,7 +1670,7 @@ Optional Features: --enable-includes enable installing of include files [default=no] --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths - --enable-bat enable build of bat Qt4 GUI [default=no] + --enable-bat enable build of bat Qt GUI [default=no] --enable-smartalloc enable smartalloc debugging support [default=no] --enable-lockmgr enable lock manager support [default=no] --enable-static-tools enable static tape tools [default=no] @@ -1719,6 +1741,9 @@ Optional Packages: --with-db-user=UNAME specify database user [default=bacula] --with-db-password=PWD specify database password [default=*none*] --with-db-port=DBPORT specify a database port [default=null] + --with-db-ssl-options=DBSSLOPTIONS + specify SSL options for database user connection + [default=null] --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 @@ -1739,6 +1764,7 @@ Optional Packages: install directory, default is to search through a number of common places for the SQLite3 files. --with-x use the X Window System + --with-s3[=DIR] specify s3 library directory --with-afsdir[=DIR] Directory holding AFS includes/libs --with-lzo[=DIR] specify lzo library directory --with-systemd[=UNITDIR] @@ -1826,7 +1852,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bacula configure 7.2.0 +bacula configure 9.0.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2761,7 +2787,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bacula $as_me 7.2.0, which was +It was created by bacula $as_me 9.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3259,6 +3285,11 @@ BDB_VERSION=`sed -n -e 's/^#define BDB_VERSION \(.*\)$/\1/p' ${srcdir}/src/cats/ DEPKGS_VERSION=`sed -n -e 's/^#define DEPKGS_VERSION \(.*\)$/\1/p' ${srcdir}/src/cats/cats.h` DEPKGS_QT_VERSION=`sed -n -e 's/^#define DEPKGS_QT_VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` BQT_VERSION=`sed -n -e 's/^#define BQT_VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +VIX_VERSION=`sed -n -e 's/^#define VIX_VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +JAVA_VERSION=`sed -n -e 's/^#define JAVA_VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +NDMP_VERSION=`sed -n -e 's/^#define NDMP_VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +LIBRSYNC_VERSION=`sed -n -e 's/^#define LIBRSYNC_VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` + LIBBAC_LT_RELEASE=`sed -n -e 's/^#.*LIBBAC_LT_RELEASE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` LIBBACCFG_LT_RELEASE=`sed -n -e 's/^#.*LIBBACCFG_LT_RELEASE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` @@ -3280,7 +3311,6 @@ LIBBACFIND_LT_RELEASE=`sed -n -e 's/^#.*LIBBACFIND_LT_RELEASE.*"\(.*\)"$/\1/p' $ LIBBACFIND_LT_RELEASE=${LIBBACFIND_LT_RELEASE:-$VERSION} - PFILES="platforms/Makefile" echo "configuring for ${BACULA} $VERSION ($DATE)" @@ -4075,8 +4105,7 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=cpp + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4756,7 +4785,7 @@ fi BASECC=`basename $CC` have_gcc=no -if test "x$BASECC" = xgcc; then +if test x"$GCC" = "xyes"; then $as_echo "#define HAVE_GCC 1" >>confdefs.h have_gcc=yes @@ -17073,6 +17102,31 @@ else fi fi +if test $HAVE_UNAME=yes -a x`uname -s` = xGNU/kFreeBSD +then + + +if $TRUEPRG; then + HAVE_KFREEBSD_OS_TRUE= + HAVE_KFREEBSD_OS_FALSE='#' +else + HAVE_KFREEBSD_OS_TRUE='#' + HAVE_KFREEBSD_OS_FALSE= +fi + $as_echo "#define HAVE_KFREEBSD_OS 1" >>confdefs.h + +else + + +if $FALSEPRG; then + HAVE_KFREEBSD_OS_TRUE= + HAVE_KFREEBSD_OS_FALSE='#' +else + HAVE_KFREEBSD_OS_TRUE='#' + HAVE_KFREEBSD_OS_FALSE= +fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Operating System Distribution" >&5 $as_echo_n "checking for Operating System Distribution... " >&6; } @@ -21775,23 +21829,21 @@ fi BAT_DIR= if test x$support_bat = xyes; then - abc=`$PKGCONFIG --atleast-version=4.2 QtGui` + abc=`$PKGCONFIG QtGui` pkg=$? if test $pkg = 0; then BAT_DIR=src/qt-console else - as_fn_error $? "Unable to find Qt4 installation needed by bat" "$LINENO" 5 + abc=`$PKGCONFIG Qt5Gui` + pkg=$? + if test $pkg = 0; then + BAT_DIR=src/qt-console + else + as_fn_error $? "Unable to find either Qt4 or Qt5 installation needed by bat" "$LINENO" 5 + fi fi fi -got_qwt=no -QWT_INC= -QWT_LDFLAGS= -QWT_LIB= -QWT= -no_qwt=no - - @@ -22616,7 +22668,7 @@ _ACEOF fi done -for ac_func in lstat lchown lchmod futimes fchmod fchown +for ac_func in lstat lchown lchmod futimes fchmod fchown lutimes do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -23658,6 +23710,20 @@ fi +db_ssl_options= + +# Check whether --with-db_ssl_options was given. +if test "${with_db_ssl_options+set}" = set; then : + withval=$with_db_ssl_options; + if test "x$withval" != "x" ; then + db_ssl_options=$withval + fi + + +fi + + + # # Handle users and groups for each daemon # @@ -24062,24 +24128,27 @@ $as_echo_n "checking for MySQL support... " >&6; } # Check whether --with-mysql was given. if test "${with_mysql+set}" = set; then : withval=$with_mysql; + HAVE_LIBSR="no" if test "$withval" != "no"; then - if test "$withval" = "yes"; then -# -# This code is very broken on older systems -# -# MYSQL_CONFIG=`which mysql_config 2>/dev/null` -# if test "x${MYSQL_CONFIG}" != x; then -# MYSQL_BINDIR="${MYSQL_CONFIG%/*}" -# ${MYSQL_CONFIG} --variable=pkglibdir > /dev/null 2>&1 -# if test $? = 0 ; then -# MYSQL_LIBDIR=`${MYSQL_CONFIG} --variable=pkglibdir` -# MYSQL_INCDIR=`${MYSQL_CONFIG} --variable=pkgincludedir` -# else -# MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs_r | sed -e 's/.*-L//' -e 's/ .*//'` -# MYSQL_INCDIR=`${MYSQL_CONFIG} --include | sed -e 's/-I//'` -# fi -# fi -# if [ "x${MYSQL_LIB}" = x -o "x${MYSQL_INCDIR}" = x ]; then + if test "$withval" = "yes"; then + MYSQL_CONFIG=`which mysql_config 2>/dev/null` + if test "x${MYSQL_CONFIG}" != x; then + MYSQL_BINDIR="${MYSQL_CONFIG%/*}" + ${MYSQL_CONFIG} --libs_r >/dev/null 2>&1 + if test $? = 0; then + MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs_r` + MYSQL_INCDIR=`${MYSQL_CONFIG} --include` + HAVE_LIBSR="yes" + else + ${MYSQL_CONFIG} --variable=pkglibdir > /dev/null 2>&1 + if test $? = 0 ; then + MYSQL_LIBDIR=`${MYSQL_CONFIG} --variable=pkglibdir` + MYSQL_INCDIR=`${MYSQL_CONFIG} --variable=pkgincludedir` + fi + fi + fi + # if something wrong fall back to old method + if test "x${MYSQL_LIBDIR}" = x -o "x${MYSQL_INCDIR}" = x ; then if test -f /usr/local/mysql/include/mysql/mysql.h; then MYSQL_INCDIR=/usr/local/mysql/include/mysql if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a \ @@ -24139,106 +24208,123 @@ if test "${with_mysql+set}" = set; then : $as_echo "no" >&6; } as_fn_error $? "Unable to find mysql.h in standard locations" "$LINENO" 5 fi - else - if test -f $withval/include/mysql/mysql.h; then - MYSQL_INCDIR=$withval/include/mysql - if test -f $withval/lib64/mysql/libmysqlclient_r.a \ - -o -f $withval/lib64/mysql/libmysqlclient_r.so; then - MYSQL_LIBDIR=$withval/lib64/mysql - elif test -f $withval/lib64/libmysqlclient_r.a \ - -o -f $withval/lib64/libmysqlclient_r.so; then - MYSQL_LIBDIR=$withval/lib64 - elif test -f $withval/lib/libmysqlclient_r.a \ - -o -f $withval/lib/libmysqlclient_r.so; then - MYSQL_LIBDIR=$withval/lib - else - MYSQL_LIBDIR=$withval/lib/mysql - fi - MYSQL_BINDIR=$withval/bin - elif test -f $withval/include/mysql.h; then - MYSQL_INCDIR=$withval/include - if test -f $withval/lib64/libmysqlclient_r.a \ - -o -f $withval/lib64/libmysqlclient_r.so; then - MYSQL_LIBDIR=$withval/lib64 - else - MYSQL_LIBDIR=$withval/lib - fi - MYSQL_BINDIR=$withval/bin - elif test -f $withval/mysql.h; then - MYSQL_INCDIR=$withval - { $as_echo "$as_me:${as_lineno-$LINENO}: Got with-mysql variable $MYSQL_INCDIR checking MySQL version" >&5 + fi + else + if test -f $withval/include/mysql/mysql.h; then + MYSQL_INCDIR=$withval/include/mysql + if test -f $withval/lib64/mysql/libmysqlclient_r.a \ + -o -f $withval/lib64/mysql/libmysqlclient_r.so; then + MYSQL_LIBDIR=$withval/lib64/mysql + elif test -f $withval/lib64/libmysqlclient_r.a \ + -o -f $withval/lib64/libmysqlclient_r.so; then + MYSQL_LIBDIR=$withval/lib64 + elif test -f $withval/lib/libmysqlclient_r.a \ + -o -f $withval/lib/libmysqlclient_r.so; then + MYSQL_LIBDIR=$withval/lib + else + MYSQL_LIBDIR=$withval/lib/mysql + fi + MYSQL_BINDIR=$withval/bin + elif test -f $withval/include/mysql.h; then + MYSQL_INCDIR=$withval/include + if test -f $withval/lib64/libmysqlclient_r.a \ + -o -f $withval/lib64/libmysqlclient_r.so; then + MYSQL_LIBDIR=$withval/lib64 + else + MYSQL_LIBDIR=$withval/lib + fi + MYSQL_BINDIR=$withval/bin + elif test -f $withval/mysql.h; then + MYSQL_INCDIR=$withval + { $as_echo "$as_me:${as_lineno-$LINENO}: Got with-mysql variable $MYSQL_INCDIR checking MySQL version" >&5 $as_echo "$as_me: Got with-mysql variable $MYSQL_INCDIR checking MySQL version" >&6;} - case $MYSQL_INCDIR in - *mysql55*) - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming MacPorts MySQL 5.5 variant installed" >&5 + case $MYSQL_INCDIR in + *mysql55*) + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming MacPorts MySQL 5.5 variant installed" >&5 $as_echo "$as_me: Assuming MacPorts MySQL 5.5 variant installed" >&6;} - if test -f $prefix/lib/mysql55/mysql/libmysqlclient_r.a \ - -o -f $prefix/lib/mysql55/mysql/libmysqlclient_r.so; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Found MySQL 5.5 library in $prefix/lib/mysql55/mysql" >&5 + if test -f $prefix/lib/mysql55/mysql/libmysqlclient_r.a \ + -o -f $prefix/lib/mysql55/mysql/libmysqlclient_r.so; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Found MySQL 5.5 library in $prefix/lib/mysql55/mysql" >&5 $as_echo "$as_me: Found MySQL 5.5 library in $prefix/lib/mysql55/mysql" >&6;} - MYSQL_LIBDIR=$prefix/lib/mysql55/mysql - fi - MYSQL_BINDIR=$prefix/lib/mysql55/bin - ;; - *mysql51*) - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming MacPorts MySQL 5.1 variant installed" >&5 + MYSQL_LIBDIR=$prefix/lib/mysql55/mysql + fi + MYSQL_BINDIR=$prefix/lib/mysql55/bin + ;; + *mysql51*) + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming MacPorts MySQL 5.1 variant installed" >&5 $as_echo "$as_me: Assuming MacPorts MySQL 5.1 variant installed" >&6;} - if test -f $prefix/lib/mysql51/mysql/libmysqlclient_r.a \ - -o -f $prefix/lib/mysql51/mysql/libmysqlclient_r.so; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Found MySQL 5.1 library in $prefix/lib/mysql55/mysql" >&5 + if test -f $prefix/lib/mysql51/mysql/libmysqlclient_r.a \ + -o -f $prefix/lib/mysql51/mysql/libmysqlclient_r.so; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Found MySQL 5.1 library in $prefix/lib/mysql55/mysql" >&5 $as_echo "$as_me: Found MySQL 5.1 library in $prefix/lib/mysql55/mysql" >&6;} - MYSQL_LIBDIR=$prefix/lib/mysql51/mysql - fi - MYSQL_BINDIR=$prefix/lib/mysql51/bin - ;; - esac - if test -z "${MYSQL_LIBDIR}" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "MySQL $withval - unable to find MySQL libraries" "$LINENO" 5 - fi - else + MYSQL_LIBDIR=$prefix/lib/mysql51/mysql + fi + MYSQL_BINDIR=$prefix/lib/mysql51/bin + ;; + esac + if test -z "${MYSQL_LIBDIR}" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "Invalid MySQL directory $withval - unable to find mysql.h under $withval" "$LINENO" 5 + as_fn_error $? "MySQL $withval - unable to find MySQL libraries" "$LINENO" 5 fi - fi - MYSQL_INCLUDE=-I$MYSQL_INCDIR - if test -f $MYSQL_LIBDIR/libmysqlclient_r.a \ - -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then - if test x$use_libtool != xno; then - MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqlclient_r -lz" else - MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "Invalid MySQL directory $withval - unable to find mysql.h under $withval" "$LINENO" 5 fi - DB_LIBS="${DB_LIBS} ${MYSQL_LIBS}" fi - MYSQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a + if test "x${MYSQL_LIBDIR}" != x; then + MYSQL_INCLUDE=-I$MYSQL_INCDIR + if test "x$HAVE_LIBSR" = "xyes"; then + DB_LIBS="${DB_LIBS} ${MYSQL_LIBS}" + MYSQL_LIBS="$MYSQL_LIBDIR" + MYSQL_INCLUDE="$MYSQL_INCDIR" + +$as_echo "#define HAVE_MYSQL_THREAD_SAFE 1" >>confdefs.h + + if test -z "${batch_insert_db_backends}"; then + batch_insert_db_backends="MySQL" + else + batch_insert_db_backends="${batch_insert_db_backends} MySQL" + fi + elif test -f $MYSQL_LIBDIR/libmysqlclient_r.a \ + -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then + if test x$use_libtool != xno; then + MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqlclient_r -lz" + else + MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz" + fi + DB_LIBS="${DB_LIBS} ${MYSQL_LIBS}" + fi + if test "x${MYSQL_LIBS}" = x; then + MYSQL_LIBS=$MYSQL_LIBDIR/libmysqlclient_r.a + fi $as_echo "#define HAVE_MYSQL 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - if test -z "${db_backends}" ; then - db_backends="MySQL" - else - db_backends="${db_backends} MySQL" - fi - if test -z "${DB_BACKENDS}" ; then - DB_BACKENDS="mysql" - else - DB_BACKENDS="${DB_BACKENDS} mysql" - fi + if test -z "${db_backends}" ; then + db_backends="MySQL" + else + db_backends="${db_backends} MySQL" + fi + if test -z "${DB_BACKENDS}" ; then + DB_BACKENDS="mysql" + else + DB_BACKENDS="${DB_BACKENDS} mysql" + fi - if test "x$support_batch_insert" = "xyes"; then - saved_LDFLAGS="${LDFLAGS}" - LDFLAGS="${saved_LDFLAGS} -L$MYSQL_LIBDIR" - saved_LIBS="${LIBS}" - LIBS="${saved_LIBS} -lz" + if test "x$HAVE_LIBSR" = "xno"; then + if test "x$support_batch_insert" = "xyes"; then + saved_LDFLAGS="${LDFLAGS}" + LDFLAGS="${saved_LDFLAGS} -L$MYSQL_LIBDIR" + saved_LIBS="${LIBS}" + LIBS="${saved_LIBS} -lz" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_thread_safe in -lmysqlclient_r" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_thread_safe in -lmysqlclient_r" >&5 $as_echo_n "checking for mysql_thread_safe in -lmysqlclient_r... " >&6; } if ${ac_cv_lib_mysqlclient_r_mysql_thread_safe+:} false; then : $as_echo_n "(cached) " >&6 @@ -24280,20 +24366,22 @@ $as_echo "#define HAVE_MYSQL_THREAD_SAFE 1" >>confdefs.h fi - if test "x$ac_cv_lib_mysqlclient_r_mysql_thread_safe" = "xyes"; then - if test -z "${batch_insert_db_backends}"; then - batch_insert_db_backends="MySQL" - else - batch_insert_db_backends="${batch_insert_db_backends} MySQL" - fi - fi + if test "x$ac_cv_lib_mysqlclient_r_mysql_thread_safe" = "xyes"; then + if test -z "${batch_insert_db_backends}"; then + batch_insert_db_backends="MySQL" + else + batch_insert_db_backends="${batch_insert_db_backends} MySQL" + fi + fi - LDFLAGS="${saved_LDFLAGS}" - LIBS="${saved_LIBS}" - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + LDFLAGS="${saved_LDFLAGS}" + LIBS="${saved_LIBS}" + fi + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + fi fi else @@ -26914,6 +27002,221 @@ fi +ac_fn_c_check_decl "$LINENO" "O_CLOEXEC" "ac_cv_have_decl_O_CLOEXEC" " +#ifdef HAVE_FCNTL_H +# include +#endif + +" +if test "x$ac_cv_have_decl_O_CLOEXEC" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_O_CLOEXEC $ac_have_decl +_ACEOF +if test $ac_have_decl = 1; then : + +else + +$as_echo "#define O_CLOEXEC 0" >>confdefs.h + +fi + + +ac_fn_c_check_decl "$LINENO" "FD_CLOEXEC" "ac_cv_have_decl_FD_CLOEXEC" " +#ifdef HAVE_FCNTL_H +# include +#endif + +" +if test "x$ac_cv_have_decl_FD_CLOEXEC" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FD_CLOEXEC $ac_have_decl +_ACEOF +if test $ac_have_decl = 1; then : + +else + +$as_echo "#define FD_CLOEXEC 0" >>confdefs.h + +fi + + +ac_fn_c_check_decl "$LINENO" "SOCK_CLOEXEC" "ac_cv_have_decl_SOCK_CLOEXEC" " +#ifdef HAVE_SYS_SOCKET_H +# include +#endif + +" +if test "x$ac_cv_have_decl_SOCK_CLOEXEC" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SOCK_CLOEXEC $ac_have_decl +_ACEOF +if test $ac_have_decl = 1; then : + +else + +$as_echo "#define SOCK_CLOEXEC 0" >>confdefs.h + +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for close on exec modifier for fopen()" >&5 +$as_echo_n "checking for close on exec modifier for fopen()... " >&6; } +if ${ac_cv_feature_stream_cloexec_flag+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test $ac_cv_have_decl_O_CLOEXEC = yes ; then + if test $ac_cv_have_decl_SOCK_CLOEXEC = yes ; then + ac_cv_feature_stream_cloexec_flag="e" + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_feature_stream_cloexec_flag" >&5 +$as_echo "$ac_cv_feature_stream_cloexec_flag" >&6; } + +if test "x$ac_cv_feature_stream_cloexec_flag" = "xe" ; then + +$as_echo "#define HAVE_STREAM_CLOEXEC 0" >>confdefs.h + +fi + + +cat >>confdefs.h <<_ACEOF +#define STREAM_CLOEXEC "$ac_cv_feature_stream_cloexec_flag" +_ACEOF + + +ac_fn_c_check_func "$LINENO" "accept4" "ac_cv_func_accept4" +if test "x$ac_cv_func_accept4" = xyes; then : + +$as_echo "#define HAVE_ACCEPT4 1" >>confdefs.h + +fi + + +S3_INC= +S3_LIBS= +S3_LDFLAGS= +have_libs3=no + +if test x$support_s3 = xyes; then + +# Check whether --with-s3 was given. +if test "${with_s3+set}" = set; then : + withval=$with_s3; + case "$with_s3" in + no) + : + ;; + yes|*) + if test -f ${with_s3}/include/libs3.h; then + S3_INC="-I${with_s3}/include" + S3_LDFLAGS="-L${with_s3}/lib" + with_s3="${with_s3}/include" + else + with_s3="/usr/include" + fi + + as_ac_Header=`$as_echo "ac_cv_header_${with_s3}/libs3.h" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "${with_s3}/libs3.h" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + + +$as_echo "#define HAVE_LIBS3 1" >>confdefs.h + + S3_LIBS="${S3_LDFLAGS} -ls3" + have_libs3="yes" + +else + + echo " " + echo "libs3.h not found. s3 turned off ..." + echo " " + + +fi + + + ;; + esac + +else + + ac_fn_c_check_header_mongrel "$LINENO" "libs3.h" "ac_cv_header_libs3_h" "$ac_includes_default" +if test "x$ac_cv_header_libs3_h" = xyes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for S3_initialize in -ls3" >&5 +$as_echo_n "checking for S3_initialize in -ls3... " >&6; } +if ${ac_cv_lib_s3_S3_initialize+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ls3 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char S3_initialize (); +int +main () +{ +return S3_initialize (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_s3_S3_initialize=yes +else + ac_cv_lib_s3_S3_initialize=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_s3_S3_initialize" >&5 +$as_echo "$ac_cv_lib_s3_S3_initialize" >&6; } +if test "x$ac_cv_lib_s3_S3_initialize" = xyes; then : + + S3_LIBS="-ls3" + +$as_echo "#define HAVE_LIBS3 1" >>confdefs.h + + have_libs3=yes + +fi + + +fi + + + +fi + +fi + + + + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -30493,8 +30796,8 @@ $as_echo "#define FDLIBS 1" >>confdefs.h CFLAGS=${CFLAGS--O} if test x$have_gcc = xyes ; then - CPPFLAGS="$CPPFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti" - CFLAGS="$CFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti" + CPPFLAGS="$CPPFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti" + CFLAGS="$CFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti" fi LDFLAGS=${LDFLAGS--O} CPPFLAGS="$CPPFLAGS" @@ -30765,6 +31068,11 @@ solaris) 5.7|5.8) $as_echo "#define USE_THR_SETCONCURRENCY 1" >>confdefs.h + ;; + 5.10) + +$as_echo "#define HAVE_SOLARIS10 1" >>confdefs.h + ;; *) ;; @@ -30818,6 +31126,7 @@ if test "${with_systemd+set}" = set; then : PFILES="${PFILES} \ platforms/systemd/Makefile \ + platforms/systemd/bacula.conf \ platforms/systemd/bacula-dir.service \ platforms/systemd/bacula-fd.service \ platforms/systemd/bacula-sd.service" @@ -30881,7 +31190,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then fi -ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/btraceback scripts/bconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/bat.pro.mingw64 src/qt-console/install_conf_file src/qt-console/tray-monitor/tray-monitor.conf src/qt-console/tray-monitor/tray-monitor.pro src/qt-console/tray-monitor/tray-monitor.pro.mingw32 src/qt-console/tray-monitor/tray-monitor.pro.mingw64 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/cats/Makefile src/cats/make_catalog_backup.pl 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_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql 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/cats/install-default-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables updatedb/update_sqlite3_tables updatedb/update_postgresql_tables updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 updatedb/update_mysql_tables_12_to_13 updatedb/update_postgresql_tables_12_to_13 updatedb/update_mysql_tables_13_to_14 updatedb/update_postgresql_tables_13_to_14 examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec platforms/rpms/suse/bacula-mtx.spec $PFILES" +ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/btraceback scripts/bconsole scripts/baculabackupreport scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps scripts/bacula-tray-monitor.desktop src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/bat.pro.mingw64 src/qt-console/install_conf_file src/qt-console/tray-monitor/tray-monitor.conf src/qt-console/tray-monitor/tray-monitor.pro src/qt-console/tray-monitor/tray-monitor.pro.mingw32 src/qt-console/tray-monitor/tray-monitor.pro.mingw64 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/cats/Makefile src/cats/make_catalog_backup.pl 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_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql 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/cats/install-default-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables updatedb/update_sqlite3_tables updatedb/update_postgresql_tables updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec platforms/rpms/suse/bacula-mtx.spec $PFILES" ac_config_commands="$ac_config_commands default" @@ -31392,7 +31701,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by bacula $as_me 7.2.0, which was +This file was extended by bacula $as_me 9.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31458,7 +31767,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -bacula config.status 7.2.0 +bacula config.status 9.0.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -31975,6 +32284,7 @@ do "manpages/Makefile") CONFIG_FILES="$CONFIG_FILES manpages/Makefile" ;; "scripts/btraceback") CONFIG_FILES="$CONFIG_FILES scripts/btraceback" ;; "scripts/bconsole") CONFIG_FILES="$CONFIG_FILES scripts/bconsole" ;; + "scripts/baculabackupreport") CONFIG_FILES="$CONFIG_FILES scripts/baculabackupreport" ;; "scripts/bacula") CONFIG_FILES="$CONFIG_FILES scripts/bacula" ;; "scripts/bacula-ctl-dir") CONFIG_FILES="$CONFIG_FILES scripts/bacula-ctl-dir" ;; "scripts/bacula-ctl-fd") CONFIG_FILES="$CONFIG_FILES scripts/bacula-ctl-fd" ;; @@ -31992,6 +32302,7 @@ do "scripts/bat.desktop.xsu") CONFIG_FILES="$CONFIG_FILES scripts/bat.desktop.xsu" ;; "scripts/bat.desktop.consolehelper") CONFIG_FILES="$CONFIG_FILES scripts/bat.desktop.consolehelper" ;; "scripts/bat.console_apps") CONFIG_FILES="$CONFIG_FILES scripts/bat.console_apps" ;; + "scripts/bacula-tray-monitor.desktop") CONFIG_FILES="$CONFIG_FILES scripts/bacula-tray-monitor.desktop" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/host.h") CONFIG_FILES="$CONFIG_FILES src/host.h" ;; "src/console/Makefile") CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;; @@ -32061,10 +32372,6 @@ do "updatedb/update_mysql_tables_11_to_12") CONFIG_FILES="$CONFIG_FILES updatedb/update_mysql_tables_11_to_12" ;; "updatedb/update_sqlite3_tables_11_to_12") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite3_tables_11_to_12" ;; "updatedb/update_postgresql_tables_11_to_12") CONFIG_FILES="$CONFIG_FILES updatedb/update_postgresql_tables_11_to_12" ;; - "updatedb/update_mysql_tables_12_to_13") CONFIG_FILES="$CONFIG_FILES updatedb/update_mysql_tables_12_to_13" ;; - "updatedb/update_postgresql_tables_12_to_13") CONFIG_FILES="$CONFIG_FILES updatedb/update_postgresql_tables_12_to_13" ;; - "updatedb/update_mysql_tables_13_to_14") CONFIG_FILES="$CONFIG_FILES updatedb/update_mysql_tables_13_to_14" ;; - "updatedb/update_postgresql_tables_13_to_14") CONFIG_FILES="$CONFIG_FILES updatedb/update_postgresql_tables_13_to_14" ;; "examples/nagios/check_bacula/Makefile") CONFIG_FILES="$CONFIG_FILES examples/nagios/check_bacula/Makefile" ;; "platforms/rpms/redhat/bacula.spec") CONFIG_FILES="$CONFIG_FILES platforms/rpms/redhat/bacula.spec" ;; "platforms/rpms/redhat/bacula-bat.spec") CONFIG_FILES="$CONFIG_FILES platforms/rpms/redhat/bacula-bat.spec" ;; @@ -33730,6 +34037,7 @@ Configuration on `date`: Database port: ${db_port} Database name: ${db_name} Database user: ${db_user} + Database SSL options: ${db_ssl_options} Job Output Email: ${job_email} Traceback Email: ${dump_email}