update configure

diff --git a/bacula/configure b/bacula/configure
index d99f36d43c7e491968b5107ba504a0fc64c65109..f81469f99029c0dd52f460e3f14022d6f1b13a91 100755 (executable)
--- 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 9.6.3.
+# Generated by GNU Autoconf 2.69 for bacula 9.6.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='9.6.3'
-PACKAGE_STRING='bacula 9.6.3'
+PACKAGE_VERSION='9.6.6'
+PACKAGE_STRING='bacula 9.6.6'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -652,6 +652,9 @@ FD_PLUGIN_DIR
 docker_bin
 XATTROBJS
 ACLOBJS
+ACSLS_BUILD_TARGET
+ACSLS_OS_DEFINE
+ACSLS_LIBDIR
 LZO_LIBS
 LZO_INC
 AFS_LIBS
@@ -659,6 +662,8 @@ AFS_CFLAGS
 ZLIBS
 S3_LIBS
 S3_INC
+CLOUD_INSTALL_TARGETS
+CLOUD_DRIVERS
 LIBOBJS
 X_EXTRA_LIBS
 X_LIBS
@@ -666,6 +671,14 @@ X_PRE_LIBS
 X_CFLAGS
 XMKMF
 GETCONF
+EXTRA_LIBSD_SRCS
+EXTRA_FINDLIB_SRCS
+EXTRA_BLS_SRCS
+EXTRA_STORED_SRCS
+EXTRA_DIRD_SRCS
+EXTRA_LIB_SRCS
+EXTRA_FILED_SRCS
+EXTRA_CATS_SRCS
 SHARED_CATALOG_TARGETS
 DEFAULT_DB_TYPE
 DB_LIBS
@@ -721,6 +734,8 @@ working_dir
 IOKITLIBS
 OPENSSL_INC
 OPENSSL_LIBS
+TOKYOCABINET_INC
+TOKYOCABINET_LIBS
 READLINE_SRC
 CONS_LDFLAGS
 CONS_LIBS
@@ -1018,8 +1033,10 @@ with_postgresql
 with_mysql
 with_embedded_mysql
 with_sqlite3
+enable_bee
 enable_largefile
 with_x
+enable_s3
 with_s3
 enable_afs
 with_afsdir
@@ -1584,7 +1601,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 9.6.3 to adapt to many kinds of systems.
+\`configure' configures bacula 9.6.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1653,7 +1670,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bacula 9.6.3:";;
+     short | recursive ) echo "Configuration of bacula 9.6.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1686,7 +1703,9 @@ Optional Features:
   --enable-ipv6           enable ipv6 support [default=yes]
   --disable-readline      disable readline support [default=yes]
   --enable-batch-insert   enable the DB batch insert code [default=yes]
+  --disable-bee           disable BEE support [default=auto]
   --disable-largefile     omit support for large files
+  --disable-s3            disable S3 support [default=yes]
   --disable-afs           disable afs support [default=auto]
   --disable-lzo           disable lzo support [default=yes]
   --disable-acl           disable acl support [default=auto]
@@ -1854,7 +1873,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-bacula configure 9.6.3
+bacula configure 9.6.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2789,7 +2808,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 9.6.3, which was
+It was created by bacula $as_me 9.6.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -23029,6 +23048,13 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 
 
+TOKYOCABINET_LIBS=
+TOKYOCABINET_INC=
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL" >&5
 $as_echo_n "checking for OpenSSL... " >&6; }
 
@@ -24865,6 +24891,54 @@ fi
 $as_echo "#define PROTOTYPES 1" >>confdefs.h
 
 
+support_bee=no
+extra_prefix=org
+nb=`ls src/*/bee_* 2>/dev/null| wc -l`
+if test $nb -gt 1; then
+   support_bee=yes
+   extra_prefix=bee
+fi
+
+# Check whether --enable-bee was given.
+if test "${enable_bee+set}" = set; then :
+  enableval=$enable_bee;
+       if test x$enableval = xyes; then
+         support_bee=yes
+          extra_prefix=bee
+       elif test x$enableval = xno; then
+         support_bee=no
+          extra_prefix=org
+       fi
+
+
+fi
+
+
+if test $support_bee = no
+then
+
+$as_echo "#define COMMUNITY 1" >>confdefs.h
+
+fi
+
+EXTRA_CATS_SRCS=`cd src/cats ; ls ${extra_prefix}_*.c      2> /dev/null | xargs echo`
+EXTRA_FILED_SRCS=`cd src/filed ; ls ${extra_prefix}_*.c    2> /dev/null | xargs echo`
+EXTRA_LIB_SRCS=`cd src/lib ; ls ${extra_prefix}_*.c        2> /dev/null | xargs echo`
+EXTRA_DIRD_SRCS=`cd src/dird ; ls ${extra_prefix}_*.c      2> /dev/null | xargs echo`
+EXTRA_STORED_SRCS=`cd src/stored ; ls ${extra_prefix}_stored_*.c  2> /dev/null | xargs echo`
+EXTRA_BLS_SRCS=`cd src/stored ; ls ${extra_prefix}_bls_*.c  2> /dev/null | xargs echo`
+EXTRA_LIBSD_SRCS=`cd src/stored ; ls ${extra_prefix}_lib*.c  2> /dev/null | xargs echo`
+EXTRA_FINDLIB_SRCS=`cd src/findlib ; ls ${extra_prefix}_*.c  2> /dev/null | xargs echo`
+
+
+
+
+
+
+
+
+
+
 if test -z "$CFLAGS" -o "$CFLAGS" = "-g -O2"; then
    if test -z "$CCOPTS"; then
       CCOPTS='-g -O2 -Wall'
@@ -27176,6 +27250,24 @@ $as_echo "#define HAVE_ACCEPT4 1" >>confdefs.h
 fi
 
 
+CLOUD_DRIVERS=
+
+
+CLOUD_INSTALL_TARGETS=
+
+
+
+# Check whether --enable-s3 was given.
+if test "${enable_s3+set}" = set; then :
+  enableval=$enable_s3;
+       if test x$enableval = xno; then
+         support_s3=no
+       fi
+
+
+fi
+
+
 S3_INC=
 S3_LIBS=
 S3_LDFLAGS=
@@ -27208,6 +27300,8 @@ $as_echo "#define HAVE_LIBS3 1" >>confdefs.h
 
                    S3_LIBS="${S3_LDFLAGS} -ls3"
                    have_libs3="yes"
+                    CLOUD_DRIVERS="${CLOUD_DRIVERS} s3-driver"
+                    CLOUD_INSTALL_TARGETS="${CLOUD_INSTALL_TARGETS} install-s3-cloud"
 
 else
 
@@ -27270,6 +27364,8 @@ if test "x$ac_cv_lib_s3_S3_initialize" = xyes; then :
 $as_echo "#define HAVE_LIBS3 1" >>confdefs.h
 
              have_libs3=yes
+              CLOUD_DRIVERS="${CLOUD_DRIVERS} s3-driver"
+              CLOUD_INSTALL_TARGETS="${CLOUD_INSTALL_TARGETS} install-s3-cloud"
 
 fi
 
@@ -29919,6 +30015,14 @@ fi
 
 
 
+ACSLS_LIBDIR=
+ACSLS_OS_DEFINE=
+ACSLS_BUILD_TARGET=
+
+
+
+
+
 
 support_acl=auto
 # Check whether --enable-acl was given.
@@ -31399,7 +31503,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then
    exit 1
 fi
 
-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/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/bacula-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 $PLUGCONFILES $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/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/bacula-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/qt-console/tray-monitor/install_conf_file 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 $PLUGCONFILES $PFILES"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -31908,7 +32012,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 9.6.3, which was
+This file was extended by bacula $as_me 9.6.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31974,7 +32078,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 9.6.3
+bacula config.status 9.6.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -32522,6 +32626,7 @@ do
     "src/qt-console/tray-monitor/tray-monitor.pro") CONFIG_FILES="$CONFIG_FILES src/qt-console/tray-monitor/tray-monitor.pro" ;;
     "src/qt-console/tray-monitor/tray-monitor.pro.mingw32") CONFIG_FILES="$CONFIG_FILES src/qt-console/tray-monitor/tray-monitor.pro.mingw32" ;;
     "src/qt-console/tray-monitor/tray-monitor.pro.mingw64") CONFIG_FILES="$CONFIG_FILES src/qt-console/tray-monitor/tray-monitor.pro.mingw64" ;;
+    "src/qt-console/tray-monitor/install_conf_file") CONFIG_FILES="$CONFIG_FILES src/qt-console/tray-monitor/install_conf_file" ;;
     "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" ;;
@@ -34163,6 +34268,8 @@ fi
 
 cd src/qt-console
 chmod 755 install_conf_file build-depkgs-qt-console
+cd tray-monitor
+chmod 755 install_conf_file build-depkgs-qt-console
 cd ${BUILD_DIR}
 
 cd scripts
@@ -34276,6 +34383,7 @@ Configuration on `date`:
    Encryption support:        ${support_crypto}
    ZLIB support:              ${have_zlib}
    LZO support:               ${have_lzo}
+   S3 support:                ${have_libs3}
    enable-smartalloc:         ${support_smartalloc}
    enable-lockmgr:            ${support_lockmgr}
    bat support:               ${support_bat}