From fac7bff873a4f04e594c9473163ef4c3a450d2e4 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 29 Aug 2017 16:12:30 +0200 Subject: [PATCH] Recompile configure.in --- bacula/autoconf/config.h.in | 6 -- bacula/configure | 186 +++--------------------------------- 2 files changed, 12 insertions(+), 180 deletions(-) diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in index 60cbb30e45..88e64e3419 100644 --- a/bacula/autoconf/config.h.in +++ b/bacula/autoconf/config.h.in @@ -797,12 +797,6 @@ /* Set if building on Solaris 10 */ #undef HAVE_SOLARIS10 -/* Set if you have an SQLite3 Database */ -#undef HAVE_SQLITE3 - -/* Set if have sqlite3_threadsafe */ -#undef HAVE_SQLITE3_THREADSAFE - /* Define to 1 if you have the header file. */ #undef HAVE_STDARG_H diff --git a/bacula/configure b/bacula/configure index 4436357f11..df6b78e25a 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 9.0.2. +# Generated by GNU Autoconf 2.69 for bacula 9.0.3. # # # 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.0.2' -PACKAGE_STRING='bacula 9.0.2' +PACKAGE_VERSION='9.0.3' +PACKAGE_STRING='bacula 9.0.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -667,9 +667,6 @@ DEFAULT_DB_TYPE DB_LIBS DB_BACKENDS uncomment_dbi -SQLITE_BINDIR -SQLITE_INCLUDE -SQLITE_LIBS MYSQL_BINDIR MYSQL_INCLUDE MYSQL_LIBS @@ -1008,7 +1005,6 @@ enable_batch_insert with_postgresql with_mysql with_embedded_mysql -with_sqlite3 enable_largefile with_x with_s3 @@ -1584,7 +1580,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.0.2 to adapt to many kinds of systems. +\`configure' configures bacula 9.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1654,7 +1650,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bacula 9.0.2:";; + short | recursive ) echo "Configuration of bacula 9.0.3:";; esac cat <<\_ACEOF @@ -1761,9 +1757,6 @@ Optional Packages: Include MySQL support. DIR is the MySQL base install directory, default is to search through a number of common places for the MySQL files. - --with-sqlite3[=DIR] Include SQLite3 support. DIR is the SQLite3 base - 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 @@ -1853,7 +1846,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bacula configure 9.0.2 +bacula configure 9.0.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2788,7 +2781,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.0.2, which was +It was created by bacula $as_me 9.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -24578,162 +24571,7 @@ fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLite3 support" >&5 -$as_echo_n "checking for SQLite3 support... " >&6; } - -# Check whether --with-sqlite3 was given. -if test "${with_sqlite3+set}" = set; then : - withval=$with_sqlite3; - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - if test -f /usr/local/include/sqlite3.h; then - SQLITE_INCDIR=/usr/local/include - if test -d /usr/local/lib64; then - SQLITE_LIBDIR=/usr/local/lib64 - else - SQLITE_LIBDIR=/usr/local/lib - fi - SQLITE_BINDIR=/usr/local/bin - elif test -f /usr/include/sqlite3.h; then - SQLITE_INCDIR=/usr/include - if test -d /usr/lib64; then - SQLITE_LIBDIR=/usr/lib64 - else - SQLITE_LIBDIR=/usr/lib - fi - SQLITE_BINDIR=/usr/bin - elif test -f $prefix/include/sqlite3.h; then - SQLITE_INCDIR=$prefix/include - if test -d $prefix/lib64; then - SQLITE_LIBDIR=$prefix/lib64 - else - SQLITE_LIBDIR=$prefix/lib - fi - SQLITE_BINDIR=$prefix/bin - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "Unable to find sqlite3.h in standard locations" "$LINENO" 5 - fi - else - if test -f $withval/sqlite3.h; then - SQLITE_INCDIR=$withval - SQLITE_LIBDIR=$withval - SQLITE_BINDIR=$withval - elif test -f $withval/include/sqlite3.h; then - SQLITE_INCDIR=$withval/include - if test -d $withval/lib64; then - SQLITE_LIBDIR=$withval/lib64 - else - SQLITE_LIBDIR=$withval/lib - fi - SQLITE_BINDIR=$withval/bin - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "Invalid SQLite3 directory $withval - unable to find sqlite3.h under $withval" "$LINENO" 5 - fi - fi - SQLITE_INCLUDE=-I$SQLITE_INCDIR - 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}" - - -$as_echo "#define HAVE_SQLITE3 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - if test -z "${db_backends}"; then - db_backends="SQLite3" - else - db_backends="${db_backends} SQLite3" - fi - if test -z "${DB_BACKENDS}"; then - DB_BACKENDS="sqlite3" - else - DB_BACKENDS="${DB_BACKENDS} sqlite3" - fi - - if test "x$support_batch_insert" = "xyes"; then - saved_LDFLAGS="${LDFLAGS}" - LDFLAGS="${saved_LDFLAGS} -lpthread -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 -$as_echo "no" >&6; } - fi - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi - - - - - - +#BA_CHECK_SQLITE3_DB if test -z "${batch_insert_db_backends}"; then batch_insert_db_backends="None" @@ -24743,7 +24581,7 @@ if test "x${db_backends}" = "x" ; then echo " " echo " " echo "You have not specified either --enable-client-only or one of the" - echo "supported databases: MySQL, PostgreSQL, or SQLite3." + echo "supported databases: MySQL, or PostgreSQL." echo "This is not permitted. Please reconfigure." echo " " echo "Aborting the configuration ..." @@ -24768,7 +24606,7 @@ case `echo $DB_BACKENDS | wc -w | sed -e 's/^ *//'` in echo " " echo " " echo "You have specified two or more of the" - echo "supported databases: MySQL, PostgreSQL, or SQLite3." + echo "supported databases: MySQL or PostgreSQL." echo "This is not permitted when not using libtool Please reconfigure." echo " " echo "Aborting the configuration ..." @@ -31703,7 +31541,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.0.2, which was +This file was extended by bacula $as_me 9.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31769,7 +31607,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.0.2 +bacula config.status 9.0.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- 2.39.5