X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=5893712b2e71914332505039b5418de95da5a7ee;hb=b28e6fb24da9384123e35265ed3f12e42333db54;hp=e97dcec3f081beb3932e03c9cf864eaf664f5079;hpb=2d2a05abf9808cabc17c47f9fd6b1c6c73c84205;p=bacula%2Fbacula diff --git a/bacula/configure b/bacula/configure index e97dcec3f0..5893712b2e 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.68 for bacula 5.1.15. +# Generated by GNU Autoconf 2.68 for bacula 5.2.2. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='bacula' PACKAGE_TARNAME='bacula' -PACKAGE_VERSION='5.1.15' -PACKAGE_STRING='bacula 5.1.15' +PACKAGE_VERSION='5.2.2' +PACKAGE_STRING='bacula 5.2.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -618,6 +618,7 @@ MACOSX WIN32 PSCMD TAPEDRIVE +SYSTEMD_UNITDIR OBJLIST WRAPLIBS WLDFLAGS @@ -636,11 +637,11 @@ X_PRE_LIBS X_CFLAGS XMKMF GETCONF -uncomment_dbi SHARED_CATALOG_TARGETS DEFAULT_DB_TYPE DB_LIBS DB_BACKENDS +uncomment_dbi SQLITE_BINDIR SQLITE_INCLUDE SQLITE_LIBS @@ -979,15 +980,16 @@ with_sd_group with_fd_user with_fd_group with_sbin_perm +enable_batch_insert with_postgresql with_mysql with_embedded_mysql with_sqlite3 -enable_batch_insert enable_largefile with_x enable_acl enable_xattr +with_systemd ' ac_precious_vars='build_alias host_alias @@ -1547,7 +1549,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 5.1.15 to adapt to many kinds of systems. +\`configure' configures bacula 5.2.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1616,7 +1618,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bacula 5.1.15:";; + short | recursive ) echo "Configuration of bacula 5.2.2:";; esac cat <<\_ACEOF @@ -1729,6 +1731,10 @@ 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-systemd[=UNITDIR] + Include systemd support. UNITDIR is where systemd + system .service files are located, default is to ask + systemctl. Some influential environment variables: CC C compiler command @@ -1813,7 +1819,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bacula configure 5.1.15 +bacula configure 5.2.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2673,97 +2679,77 @@ fi } # ac_fn_cxx_try_run -# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES -# --------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_cxx_check_header_mongrel () +# ac_fn_cxx_check_func LINENO FUNC VAR +# ------------------------------------ +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_cxx_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* 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 $2 (); +/* 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_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} _ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - ac_header_preproc=yes +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$3=yes" else - ac_header_preproc=no + eval "$3=no" fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -} # ac_fn_cxx_check_header_mongrel +} # ac_fn_cxx_check_func 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 5.1.15, which was +It was created by bacula $as_me 5.2.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -18598,8 +18584,8 @@ if test x$mandir = x'${prefix}/man' ; then mandir=/usr/share/man fi -if test x$htmldir = x${docdir} ; then - htmldir=`eval echo ${docdir}bacula/html` +if test x$htmldir = x'/usr/share/doc/bacula/' ; then + htmldir=`eval echo ${docdir}html` fi if test x$docdir = x'/usr/share/doc/' ; then @@ -21438,6 +21424,7 @@ build_client_only=no build_dird=yes build_stored=yes db_backends="" +batch_insert_db_backends="" support_lockmgr=no @@ -22025,7 +22012,7 @@ if test x$support_conio = xyes; then $as_echo "#define HAVE_CONIO 1" >>confdefs.h else - echo " "; echo "Required libraries not found. CONIO turned off ..."; echo " "], + echo " "; echo "Required libraries not found. CONIO turned off ..."; echo " " fi fi @@ -22993,6 +22980,8 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $support_tls" >&5 +$as_echo "$support_tls" >&6; } if test "$support_tls" = "yes"; then $as_echo "#define HAVE_OPENSSL 1" >>confdefs.h @@ -23067,17 +23056,11 @@ fi else support_tls="no" support_crypto="no" - OPENSSL_LIBS="" - OPENSSL_INC="" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $support_tls" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $support_tls" >&5 $as_echo "$support_tls" >&6; } - -if test "$support_tls" = "no"; then - OPENSSL_LIBS="" - OPENSSL_INC="" fi -if test "$support_crypto" = "no"; then + +if test "$support_tls" = "no" -o "$support_crypto" = "no"; then OPENSSL_LIBS="" OPENSSL_INC="" fi @@ -23677,6 +23660,27 @@ fi +support_batch_insert=yes +# Check whether --enable-batch-insert was given. +if test "${enable_batch_insert+set}" = set; then : + enableval=$enable_batch_insert; + if test x$enableval = xno; then + support_batch_insert=no + fi + + +fi + + +if test x$support_batch_insert = xyes; then + +$as_echo "#define USE_BATCH_FILE_INSERT 1" >>confdefs.h + +fi + + +uncomment_dbi="#" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support" >&5 $as_echo_n "checking for PostgreSQL support... " >&6; } @@ -23686,7 +23690,7 @@ if test "${with_postgresql+set}" = set; then : withval=$with_postgresql; if test "$withval" != "no"; then if test "$withval" = "yes"; then - PG_CONFIG=`which pg_config` + PG_CONFIG=`which pg_config 2>/dev/null` if test -n "$PG_CONFIG"; then POSTGRESQL_INCDIR=`"$PG_CONFIG" --includedir` POSTGRESQL_LIBDIR=`"$PG_CONFIG" --libdir` @@ -23752,7 +23756,11 @@ $as_echo "#define HAVE_POSTGRESQL 1" >>confdefs.h $as_echo "yes" >&6; } POSTGRESQL_INCLUDE=-I$POSTGRESQL_INCDIR - POSTGRESQL_LIBS="-R $POSTGRESQL_LIBDIR -L$POSTGRESQL_LIBDIR -lpq" + if test x$use_libtool != xno; then + POSTGRESQL_LIBS="-R $POSTGRESQL_LIBDIR -L$POSTGRESQL_LIBDIR -lpq" + else + POSTGRESQL_LIBS="-L$POSTGRESQL_LIBDIR -lpq" + fi ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt" if test "x$ac_cv_func_crypt" = xyes; then : @@ -23811,6 +23819,122 @@ fi DB_BACKENDS="postgresql" else DB_BACKENDS="${DB_BACKENDS} postgresql" + fi + + if test "x$support_batch_insert" = "xyes"; then + saved_LDFLAGS="${LDFLAGS}" + LDFLAGS="${saved_LDFLAGS} -L$POSTGRESQL_LIBDIR" + saved_LIBS="${LIBS}" + if test "x$ac_cv_lib_crypt_crypt" = "xyes" ; then + LIBS="${saved_LIBS} -lcrypt" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQisthreadsafe in -lpq" >&5 +$as_echo_n "checking for PQisthreadsafe in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQisthreadsafe+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpq $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 PQisthreadsafe (); +int +main () +{ +return PQisthreadsafe (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQisthreadsafe=yes +else + ac_cv_lib_pq_PQisthreadsafe=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_pq_PQisthreadsafe" >&5 +$as_echo "$ac_cv_lib_pq_PQisthreadsafe" >&6; } +if test "x$ac_cv_lib_pq_PQisthreadsafe" = xyes; then : + +$as_echo "#define HAVE_PQISTHREADSAFE 1" >>confdefs.h + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQputCopyData in -lpq" >&5 +$as_echo_n "checking for PQputCopyData in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQputCopyData+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpq $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 PQputCopyData (); +int +main () +{ +return PQputCopyData (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQputCopyData=yes +else + ac_cv_lib_pq_PQputCopyData=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_pq_PQputCopyData" >&5 +$as_echo "$ac_cv_lib_pq_PQputCopyData" >&6; } +if test "x$ac_cv_lib_pq_PQputCopyData" = xyes; then : + +$as_echo "#define HAVE_PQ_COPY 1" >>confdefs.h + +fi + + if test "x$ac_cv_lib_pq_PQputCopyData" = "xyes"; then + if test $support_batch_insert = yes ; then + +$as_echo "#define HAVE_POSTGRESQL_BATCH_FILE_INSERT 1" >>confdefs.h + + if test -z "${batch_insert_db_backends}"; then + batch_insert_db_backends="PostgreSQL" + else + batch_insert_db_backends="${batch_insert_db_backends} PostgreSQL" + fi + fi + fi + + if test x$ac_cv_lib_pq_PQisthreadsafe != xyes -a x$support_batch_insert = xyes + then + echo "WARNING: Your PostgreSQL client library is too old to detect " + echo "if it was compiled with --enable-thread-safety, consider to " + echo "upgrade it in order to avoid problems with Batch insert mode" + fi + + LDFLAGS="${saved_LDFLAGS}" + LIBS="${saved_LIBS}" fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -23929,7 +24053,11 @@ $as_echo "no" >&6; } MYSQL_INCLUDE=-I$MYSQL_INCDIR if test -f $MYSQL_LIBDIR/libmysqlclient_r.a \ -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then - MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqlclient_r -lz" + 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 $as_echo "#define HAVE_THREAD_SAFE_MYSQL 1" >>confdefs.h @@ -23952,16 +24080,82 @@ $as_echo "yes" >&6; } 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" + + { $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 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmysqlclient_r $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 mysql_thread_safe (); +int +main () +{ +return mysql_thread_safe (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mysqlclient_r_mysql_thread_safe=yes +else + ac_cv_lib_mysqlclient_r_mysql_thread_safe=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_mysqlclient_r_mysql_thread_safe" >&5 +$as_echo "$ac_cv_lib_mysqlclient_r_mysql_thread_safe" >&6; } +if test "x$ac_cv_lib_mysqlclient_r_mysql_thread_safe" = xyes; then : + +$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 + + LDFLAGS="${saved_LDFLAGS}" + LIBS="${saved_LIBS}" fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL embedded support" >&5 +$as_echo_n "checking for MySQL embedded support... " >&6; } # Check whether --with-embedded-mysql was given. if test "${with_embedded_mysql+set}" = set; then : @@ -24037,7 +24231,11 @@ $as_echo "no" >&6; } fi fi MYSQL_INCLUDE=-I$MYSQL_INCDIR - MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt" + if test x$use_libtool != xno; then + MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt" + else + MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt" + fi MYSQL_LIB=$MYSQL_LIBDIR/libmysqld.a DB_LIBS="${DB_LIBS} ${MYSQL_LIBS}" @@ -24059,12 +24257,76 @@ $as_echo "yes" >&6; } 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 -lm -lcrypt" + + { $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 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmysqlclient_r $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 mysql_thread_safe (); +int +main () +{ +return mysql_thread_safe (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mysqlclient_r_mysql_thread_safe=yes +else + ac_cv_lib_mysqlclient_r_mysql_thread_safe=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_mysqlclient_r_mysql_thread_safe" >&5 +$as_echo "$ac_cv_lib_mysqlclient_r_mysql_thread_safe" >&6; } +if test "x$ac_cv_lib_mysqlclient_r_mysql_thread_safe" = xyes; then : + +$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 + + LDFLAGS="${saved_LDFLAGS}" + LIBS="${saved_LIBS}" fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -24133,7 +24395,11 @@ $as_echo "no" >&6; } fi fi SQLITE_INCLUDE=-I$SQLITE_INCDIR - SQLITE_LIBS="-R $SQLITE_LIBDIR -L$SQLITE_LIBDIR -lsqlite3" + if test x$use_libtool != xno; then + SQLITE_LIBS="-R $SQLITE_LIBDIR -L$SQLITE_LIBDIR -lsqlite3" + else + SQLITE_LIBS="-L$SQLITE_LIBDIR -lsqlite3" + fi SQLITE_LIB=$SQLITE_LIBDIR/libsqlite3.a DB_LIBS="${DB_LIBS} ${SQLITE_LIBS}" @@ -24152,6 +24418,63 @@ $as_echo "yes" >&6; } DB_BACKENDS="sqlite3" else DB_BACKENDS="${DB_BACKENDS} sqlite3" + fi + + if test "x$support_batch_insert" = "xyes"; then + saved_LDFLAGS="${LDFLAGS}" + LDFLAGS="${saved_LDFLAGS} -L$SQLITE_LIBDIR" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_threadsafe in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_threadsafe in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_threadsafe+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsqlite3 $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 sqlite3_threadsafe (); +int +main () +{ +return sqlite3_threadsafe (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_sqlite3_sqlite3_threadsafe=yes +else + ac_cv_lib_sqlite3_sqlite3_threadsafe=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_sqlite3_sqlite3_threadsafe" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_threadsafe" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_threadsafe" = xyes; then : + +$as_echo "#define HAVE_SQLITE3_THREADSAFE 1" >>confdefs.h + +fi + + if test "x$ac_cv_lib_sqlite3_sqlite3_threadsafe" = "xyes"; then + if test -z "${batch_insert_db_backends}"; then + batch_insert_db_backends="SQLite3" + else + batch_insert_db_backends="${batch_insert_db_backends} SQLite3" + fi + fi + + LDFLAGS="${saved_LDFLAGS}" fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -24177,6 +24500,10 @@ fi #BA_CHECK_DBI_DRIVER +if test -z "${batch_insert_db_backends}"; then + batch_insert_db_backends="None" +fi + if test "x${db_backends}" = "x" ; then echo " " echo " " @@ -24236,322 +24563,6 @@ fi -support_batch_insert=yes -# Check whether --enable-batch-insert was given. -if test "${enable_batch_insert+set}" = set; then : - enableval=$enable_batch_insert; - if test x$enableval = xno; then - support_batch_insert=no - fi - - -fi - - -if test x$support_batch_insert = xyes; then - -$as_echo "#define USE_BATCH_FILE_INSERT 1" >>confdefs.h - -fi - -if test ! -z "$MYSQL_LIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_thread_safe in -lmysql_r" >&5 -$as_echo_n "checking for mysql_thread_safe in -lmysql_r... " >&6; } -if ${ac_cv_lib_mysql_r_mysql_thread_safe+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmysql_r $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 mysql_thread_safe (); -int -main () -{ -return mysql_thread_safe (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_mysql_r_mysql_thread_safe=yes -else - ac_cv_lib_mysql_r_mysql_thread_safe=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_mysql_r_mysql_thread_safe" >&5 -$as_echo "$ac_cv_lib_mysql_r_mysql_thread_safe" >&6; } -if test "x$ac_cv_lib_mysql_r_mysql_thread_safe" = xyes; then : - -$as_echo "#define HAVE_MYSQL_THREAD_SAFE 1" >>confdefs.h - -fi - -fi - -if test ! -z "SQLITE_LIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_threadsafe in -lsqlite3" >&5 -$as_echo_n "checking for sqlite3_threadsafe in -lsqlite3... " >&6; } -if ${ac_cv_lib_sqlite3_sqlite3_threadsafe+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsqlite3 $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 sqlite3_threadsafe (); -int -main () -{ -return sqlite3_threadsafe (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_sqlite3_sqlite3_threadsafe=yes -else - ac_cv_lib_sqlite3_sqlite3_threadsafe=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_sqlite3_sqlite3_threadsafe" >&5 -$as_echo "$ac_cv_lib_sqlite3_sqlite3_threadsafe" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_threadsafe" = xyes; then : - -$as_echo "#define HAVE_SQLITE3_THREADSAFE 1" >>confdefs.h - -fi - -fi - -if test ! -z "$POSTGRESQL_LIB"; then - saved_LIBS="${LIBS}" - LIBS="${saved_LIBS} ${POSTGRESQL_LIB}" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQisthreadsafe in -lpq" >&5 -$as_echo_n "checking for PQisthreadsafe in -lpq... " >&6; } -if ${ac_cv_lib_pq_PQisthreadsafe+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpq $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 PQisthreadsafe (); -int -main () -{ -return PQisthreadsafe (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_pq_PQisthreadsafe=yes -else - ac_cv_lib_pq_PQisthreadsafe=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_pq_PQisthreadsafe" >&5 -$as_echo "$ac_cv_lib_pq_PQisthreadsafe" >&6; } -if test "x$ac_cv_lib_pq_PQisthreadsafe" = xyes; then : - -$as_echo "#define HAVE_PQISTHREADSAFE 1" >>confdefs.h - -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQputCopyData in -lpq" >&5 -$as_echo_n "checking for PQputCopyData in -lpq... " >&6; } -if ${ac_cv_lib_pq_PQputCopyData+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpq $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 PQputCopyData (); -int -main () -{ -return PQputCopyData (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_pq_PQputCopyData=yes -else - ac_cv_lib_pq_PQputCopyData=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_pq_PQputCopyData" >&5 -$as_echo "$ac_cv_lib_pq_PQputCopyData" >&6; } -if test "x$ac_cv_lib_pq_PQputCopyData" = xyes; then : - -$as_echo "#define HAVE_PQ_COPY 1" >>confdefs.h - -fi - - if test "x$ac_cv_lib_pq_PQputCopyData" = "xyes"; then - if test $support_batch_insert = yes ; then - -$as_echo "#define HAVE_POSTGRESQL_BATCH_FILE_INSERT 1" >>confdefs.h - - fi - fi - - if test x$ac_cv_lib_pq_PQisthreadsafe != xyes -a x$support_batch_insert = xyes - then - echo "WARNING: Your PostgreSQL client library is too old to detect " - echo "if it was compiled with --enable-thread-safety, consider to " - echo "upgrade it in order to avoid problems with Batch insert mode" - echo - fi - - LIBS="${saved_LIBS}" -fi - -if test ! -z "$DBI_LIBS"; then - DB_BACKENDS="${DB_BACKENDS} ${DB_PROG}" - - if test $DB_PROG = postgresql; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQisthreadsafe in -lpq" >&5 -$as_echo_n "checking for PQisthreadsafe in -lpq... " >&6; } -if ${ac_cv_lib_pq_PQisthreadsafe+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpq $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 PQisthreadsafe (); -int -main () -{ -return PQisthreadsafe (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_pq_PQisthreadsafe=yes -else - ac_cv_lib_pq_PQisthreadsafe=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_pq_PQisthreadsafe" >&5 -$as_echo "$ac_cv_lib_pq_PQisthreadsafe" >&6; } -if test "x$ac_cv_lib_pq_PQisthreadsafe" = xyes; then : - $as_echo "#define HAVE_PQISTHREADSAFE 1" >>confdefs.h - -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQputCopyData in -lpq" >&5 -$as_echo_n "checking for PQputCopyData in -lpq... " >&6; } -if ${ac_cv_lib_pq_PQputCopyData+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpq $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 PQputCopyData (); -int -main () -{ -return PQputCopyData (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_pq_PQputCopyData=yes -else - ac_cv_lib_pq_PQputCopyData=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_pq_PQputCopyData" >&5 -$as_echo "$ac_cv_lib_pq_PQputCopyData" >&6; } -if test "x$ac_cv_lib_pq_PQputCopyData" = xyes; then : - $as_echo "#define HAVE_PQ_COPY 1" >>confdefs.h - -fi - - test "x$ac_cv_lib_pq_PQputCopyData" = "xyes" - pkg=$? - if test $pkg = 0; then - if test $support_batch_insert = yes ; then - -$as_echo "#define HAVE_DBI_BATCH_FILE_INSERT 1" >>confdefs.h - - fi - fi - fi -else - uncomment_dbi="#" -fi - - $as_echo "#define PROTOTYPES 1" >>confdefs.h @@ -26763,20 +26774,15 @@ 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' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -for ac_header in cxxabi.h execinfo.h +for ac_func in backtrace do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + ac_fn_cxx_check_func "$LINENO" "backtrace" "ac_cv_func_backtrace" +if test "x$ac_cv_func_backtrace" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_BACKTRACE 1 _ACEOF -$as_echo "#define HAVE_BACKTRACE 1" >>confdefs.h - fi - done ac_ext=c @@ -30288,6 +30294,47 @@ unknown) ;; esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for systemd support" >&5 +$as_echo_n "checking for systemd support... " >&6; } + +# Check whether --with-systemd was given. +if test "${with_systemd+set}" = set; then : + withval=$with_systemd; + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + SYSTEMD_UNITDIR="`systemctl show | grep UnitPath | cut -d " " -f2`" + else + SYSTEMD_UNITDIR="${withval}" + fi + + PFILES="${PFILES} \ + platforms/systemd/Makefile \ + platforms/systemd/bacula-dir.service \ + platforms/systemd/bacula-fd.service \ + platforms/systemd/bacula-sd.service" + +$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + support_systemd="yes" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + support_systemd="no" + fi + +else + + support_systemd="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + +fi + + + LIBS="$PTHREAD_LIB $LIBS" @@ -30324,7 +30371,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/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd 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/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu 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/tray-monitor/tray-monitor.pro src/qt-console/tray-monitor/tray-monitor.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-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/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 src/win32/Makefile.inc po/Makefile.in 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 $PFILES" +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/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/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu 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/tray-monitor/tray-monitor.pro src/qt-console/tray-monitor/tray-monitor.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-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/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 src/win32/Makefile.inc po/Makefile.in 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_14 updatedb/update_sqlite3_tables_12_to_14 updatedb/update_postgresql_tables_12_to_14 examples/nagios/check_bacula/Makefile $PFILES" ac_config_commands="$ac_config_commands default" @@ -30847,7 +30894,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 5.1.15, which was +This file was extended by bacula $as_me 5.2.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30913,7 +30960,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 5.1.15 +bacula config.status 5.2.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -31445,7 +31492,6 @@ do "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/bgnome-console.console_apps") CONFIG_FILES="$CONFIG_FILES scripts/bgnome-console.console_apps" ;; "scripts/mtx-changer") CONFIG_FILES="$CONFIG_FILES scripts/mtx-changer" ;; "scripts/disk-changer") CONFIG_FILES="$CONFIG_FILES scripts/disk-changer" ;; "scripts/dvd-handler") CONFIG_FILES="$CONFIG_FILES scripts/dvd-handler" ;; @@ -31528,6 +31574,9 @@ 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_14") CONFIG_FILES="$CONFIG_FILES updatedb/update_mysql_tables_12_to_14" ;; + "updatedb/update_sqlite3_tables_12_to_14") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite3_tables_12_to_14" ;; + "updatedb/update_postgresql_tables_12_to_14") CONFIG_FILES="$CONFIG_FILES updatedb/update_postgresql_tables_12_to_14" ;; "examples/nagios/check_bacula/Makefile") CONFIG_FILES="$CONFIG_FILES examples/nagios/check_bacula/Makefile" ;; "$PFILES") CONFIG_FILES="$CONFIG_FILES $PFILES" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; @@ -33211,28 +33260,29 @@ Configuration on `date`: File Daemon User: ${fd_user} File Daemon Group: ${fd_group} - Large file support: $largefile_support - Bacula conio support: ${got_conio} ${CONS_LIBS} - readline support: ${got_readline} ${PRTREADLINE_SRC} - TCP Wrappers support: ${TCPW_MSG} ${WRAPLIBS} - TLS support: ${support_tls} - Encryption support: ${support_crypto} - ZLIB support: ${have_zlib} - LZO support: ${have_lzo} - enable-smartalloc: ${support_smartalloc} - enable-lockmgr: ${support_lockmgr} - bat support: ${support_bat} - enable-gnome: ${support_gnome} ${gnome_version} - enable-bwx-console: ${support_wx_console} ${wx_version} - enable-tray-monitor: ${support_tray_monitor} - client-only: ${build_client_only} - build-dird: ${build_dird} - build-stored: ${build_stored} - Plugin support: ${have_plugins} - ACL support: ${have_acl} - XATTR support: ${have_xattr} - Python support: ${support_python} ${PYTHON_LIBS} - Batch insert enabled: ${support_batch_insert} + Large file support: $largefile_support + Bacula conio support: ${got_conio} ${CONS_LIBS} + readline support: ${got_readline} ${PRTREADLINE_SRC} + TCP Wrappers support: ${TCPW_MSG} ${WRAPLIBS} + TLS support: ${support_tls} + Encryption support: ${support_crypto} + ZLIB support: ${have_zlib} + LZO support: ${have_lzo} + enable-smartalloc: ${support_smartalloc} + enable-lockmgr: ${support_lockmgr} + bat support: ${support_bat} + enable-gnome: ${support_gnome} ${gnome_version} + enable-bwx-console: ${support_wx_console} ${wx_version} + enable-tray-monitor: ${support_tray_monitor} + client-only: ${build_client_only} + build-dird: ${build_dird} + build-stored: ${build_stored} + Plugin support: ${have_plugins} + ACL support: ${have_acl} + XATTR support: ${have_xattr} + Python support: ${support_python} ${PYTHON_LIBS} + systemd support: ${support_systemd} ${SYSTEMD_UNITDIR} + Batch insert enabled: ${batch_insert_db_backends} " > config.out