X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=53f7c3aaf842417592fb3333b6fa0b6e4f276eb6;hb=dbc2c7f30da831ec0e06a098bdba044ae41e8217;hp=f3b01e3f1c73720acdbae10cf304b258097a3723;hpb=340b8650fae534567f349559dc0f7d42519937a8;p=bacula%2Fbacula diff --git a/bacula/configure b/bacula/configure index f3b01e3f1c..53f7c3aaf8 100755 --- a/bacula/configure +++ b/bacula/configure @@ -752,7 +752,6 @@ OBJLIST WRAPLIBS WLDFLAGS WCFLAGS -DB_LIBS DLIB DINCLUDE DEBUG @@ -768,15 +767,29 @@ X_PRE_LIBS X_CFLAGS XMKMF GETCONF -DB_TYPE -cats +SHARED_CATALOG_TARGETS +DEFAULT_DB_TYPE +DB_LIBS +DB_BACKENDS DB_PROG_LIB DB_PROG uncomment_dbi DBI_DBD_DRIVERDIR -SQL_BINDIR -SQL_INCLUDE -SQL_LFLAGS +DBI_BINDIR +DBI_INCLUDE +DBI_LIBS +INGRES_BINDIR +INGRES_INCLUDE +INGRES_LIBS +SQLITE_BINDIR +SQLITE_INCLUDE +SQLITE_LIBS +MYSQL_BINDIR +MYSQL_INCLUDE +MYSQL_LIBS +POSTGRESQL_BINDIR +POSTGRESQL_INCLUDE +POSTGRESQL_LIBS SBINPERM fd_group fd_user @@ -979,10 +992,12 @@ LDFLAGS CFLAGS CC LIBBACFIND_LT_RELEASE +LIBBACCATS_LT_RELEASE LIBBACSQL_LT_RELEASE LIBBACPY_LT_RELEASE LIBBACCFG_LT_RELEASE LIBBAC_LT_RELEASE +BDB_VERSION post_host BACULA LSMDATE @@ -1104,8 +1119,8 @@ with_sbin_perm with_postgresql with_mysql with_embedded_mysql -with_ingres with_sqlite3 +with_ingres with_dbi with_dbi_driver enable_batch_insert @@ -1776,7 +1791,7 @@ Optional Features: --disable-conio disable conio support [default=no] --enable-ipv6 enable ipv6 support [default=yes] --disable-readline disable readline support [default=yes] - --enable-batch-insert enable the DB batch insert code [default=no] + --enable-batch-insert enable the DB batch insert code [default=yes] --disable-largefile omit support for large files --disable-afs disable afs support [default=auto] --disable-acl disable acl support [default=auto] @@ -1848,12 +1863,12 @@ 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-ingres[=DIR] Include Ingres support. DIR is the Ingres base - install directory, default is to search through a - number of common places for the Ingres 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-ingres[=DIR] Include Ingres support. DIR is the Ingres base + install directory, default is to search through a + number of common places for the Ingres files. --with-dbi[=DIR] Include DBI support. DIR is the DBD base install directory, default is to search through a number of common places for the DBI files. @@ -3294,6 +3309,7 @@ BACULA=${BACULA:-Bacula} VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` DATE=`sed -n -e 's/^.* \t*BDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` LSMDATE=`sed -n -e 's/^.*LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +BDB_VERSION=`sed -n -e 's/^.*BDB_VERSION \(.*\)$/\1/p' ${srcdir}/src/cats/cats.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` @@ -3305,8 +3321,10 @@ LIBBACPY_LT_RELEASE=${LIBBACPY_LT_RELEASE:-$VERSION} LIBBACSQL_LT_RELEASE=`sed -n -e 's/^#.*LIBBACSQL_LT_RELEASE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +LIBBACCATS_LT_RELEASE=`sed -n -e 's/^#.*LIBBACCATS_LT_RELEASE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` LIBBACSQL_LT_RELEASE=${LIBBACSQL_LT_RELEASE:-$VERSION} +LIBBACCATS_LT_RELEASE=${LIBBACCATS_LT_RELEASE:-$VERSION} LIBBACFIND_LT_RELEASE=`sed -n -e 's/^#.*LIBBACFIND_LT_RELEASE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` @@ -6508,13 +6526,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6511: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6529: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6514: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6532: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6517: output\"" >&5) + (eval echo "\"\$as_me:6535: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7719,7 +7737,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7722 "configure"' > conftest.$ac_ext + echo '#line 7740 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9509,11 +9527,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9512: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9530: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9516: \$? = $ac_status" >&5 + echo "$as_me:9534: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9848,11 +9866,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9851: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9869: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9855: \$? = $ac_status" >&5 + echo "$as_me:9873: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9953,11 +9971,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9956: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9974: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9960: \$? = $ac_status" >&5 + echo "$as_me:9978: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10008,11 +10026,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10011: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10029: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10015: \$? = $ac_status" >&5 + echo "$as_me:10033: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12375,7 +12393,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12378 "configure" +#line 12396 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12471,7 +12489,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12474 "configure" +#line 12492 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14427,11 +14445,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14430: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14448: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14434: \$? = $ac_status" >&5 + echo "$as_me:14452: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14526,11 +14544,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14529: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14547: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14533: \$? = $ac_status" >&5 + echo "$as_me:14551: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14578,11 +14596,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14581: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14599: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14585: \$? = $ac_status" >&5 + echo "$as_me:14603: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15961,6 +15979,9 @@ then elif test -f /etc/engarde-version then DISTNAME=engarde +elif test -f /etc/arch-release +then + DISTNAME=archlinux elif test "$CYGWIN" = yes then DISTNAME=cygwin @@ -18767,6 +18788,7 @@ int main () { char *data, *data2, *data3; + const char *cdata2; int i, pagesize; int fd, fd2; @@ -18791,10 +18813,10 @@ main () fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); if (fd2 < 0) return 4; - data2 = ""; - if (write (fd2, data2, 1) != 1) + cdata2 = ""; + if (write (fd2, cdata2, 1) != 1) return 5; - data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); + data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); if (data2 == MAP_FAILED) return 6; for (i = 0; i < pagesize; ++i) @@ -20560,12 +20582,6 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h fi -support_mysql=no -support_sqlite=no -support_sqlite3=no -support_postgresql=no -support_ingres=no -support_dbi=no support_smartalloc=yes support_readline=yes support_conio=yes @@ -20586,10 +20602,8 @@ support_python=no build_client_only=no build_dird=yes build_stored=yes -cats= -db_type=Internal +db_backends="" support_lockmgr=no -DB_TYPE=bdb # Check whether --enable-gnome was given. @@ -20864,8 +20878,8 @@ if test "${enable_client_only+set}" = set; then : enableval=$enable_client_only; if test x$enableval = xyes; then build_client_only=yes - db_type=None - DB_TYPE=none + db_backends="None" + DB_BACKENDS="none" fi @@ -20971,7 +20985,48 @@ fi TERM_LIB="" ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default" if test "x$ac_cv_header_curses_h" = x""yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5 +$as_echo_n "checking for tgetent in -ltinfo... " >&6; } +if test "${ac_cv_lib_tinfo_tgetent+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltinfo $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 tgetent (); +int +main () +{ +return tgetent (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_tinfo_tgetent=yes +else + ac_cv_lib_tinfo_tgetent=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_tinfo_tgetent" >&5 +$as_echo "$ac_cv_lib_tinfo_tgetent" >&6; } +if test "x$ac_cv_lib_tinfo_tgetent" = x""yes; then : + TERM_LIB="-ltinfo" +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5 $as_echo_n "checking for tgetent in -lncurses... " >&6; } if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -21010,7 +21065,8 @@ $as_echo "$ac_cv_lib_ncurses_tgetent" >&6; } if test "x$ac_cv_lib_ncurses_tgetent" = x""yes; then : TERM_LIB="-lncurses" else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 $as_echo_n "checking for tgetent in -ltermcap... " >&6; } if test "${ac_cv_lib_termcap_tgetent+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -21054,6 +21110,9 @@ fi fi +fi + + else for ac_header in curses.h do : @@ -22104,9 +22163,6 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LIBS="${saved_LIBS}" - CFLAGS="${saved_CFLAGS}" - if test "$support_tls" = "yes"; then $as_echo "#define HAVE_OPENSSL 1" >>confdefs.h @@ -22130,30 +22186,15 @@ $as_echo "#define HAVE_SHA2 1" >>confdefs.h $as_echo "#define HAVE_OPENSSL_EXPORT_LIBRARY 1" >>confdefs.h 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 "$support_tls" >&6; } -if test "$support_tls" = "no"; then - OPENSSL_LIBS="" - OPENSSL_INC="" -fi -if test "$support_crypto" = "no"; then - OPENSSL_LIBS="" - OPENSSL_INC="" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_PKEY_encrypt_old in -lssl" >&5 -$as_echo_n "checking for EVP_PKEY_encrypt_old in -lssl... " >&6; } -if test "${ac_cv_lib_ssl_EVP_PKEY_encrypt_old+set}" = set; then : + if test "$support_crypto" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_PKEY_encrypt_old in -lcrypto" >&5 +$as_echo_n "checking for EVP_PKEY_encrypt_old in -lcrypto... " >&6; } +if test "${ac_cv_lib_crypto_EVP_PKEY_encrypt_old+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lssl $LIBS" +LIBS="-lcrypto $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -22173,22 +22214,42 @@ return EVP_PKEY_encrypt_old (); } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ssl_EVP_PKEY_encrypt_old=yes + ac_cv_lib_crypto_EVP_PKEY_encrypt_old=yes else - ac_cv_lib_ssl_EVP_PKEY_encrypt_old=no + ac_cv_lib_crypto_EVP_PKEY_encrypt_old=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_ssl_EVP_PKEY_encrypt_old" >&5 -$as_echo "$ac_cv_lib_ssl_EVP_PKEY_encrypt_old" >&6; } -if test "x$ac_cv_lib_ssl_EVP_PKEY_encrypt_old" = x""yes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_PKEY_encrypt_old" >&5 +$as_echo "$ac_cv_lib_crypto_EVP_PKEY_encrypt_old" >&6; } +if test "x$ac_cv_lib_crypto_EVP_PKEY_encrypt_old" = x""yes; then : $as_echo "#define HAVE_OPENSSLv1 1" >>confdefs.h fi + fi + + LIBS="${saved_LIBS}" + CFLAGS="${saved_CFLAGS}" +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 "$support_tls" >&6; } + +if test "$support_tls" = "no"; then + OPENSSL_LIBS="" + OPENSSL_INC="" +fi +if test "$support_crypto" = "no"; then + OPENSSL_LIBS="" + OPENSSL_INC="" fi @@ -22786,9 +22847,7 @@ fi -SQL_LIB= -db_found=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support" >&5 $as_echo_n "checking for PostgreSQL support... " >&6; } @@ -22796,14 +22855,9 @@ $as_echo_n "checking for PostgreSQL support... " >&6; } if test "${with_postgresql+set}" = set; then : withval=$with_postgresql; if test "$withval" != "no"; then - if test "$db_found" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5 -$as_echo "error" >&6; } - as_fn_error "\"You can configure for only one database.\"" "$LINENO" 5; - fi if test "$withval" = "yes"; then PG_CONFIG=`which pg_config` - if test -n "$PG_CONFIG";then + if test -n "$PG_CONFIG"; then POSTGRESQL_INCDIR=`"$PG_CONFIG" --includedir` POSTGRESQL_LIBDIR=`"$PG_CONFIG" --libdir` POSTGRESQL_BINDIR=`"$PG_CONFIG" --bindir` @@ -22850,23 +22904,26 @@ $as_echo "no" >&6; } POSTGRESQL_BINDIR=$withval/bin elif test -f $withval/include/postgresql/libpq-fe.h; then POSTGRESQL_INCDIR=$withval/include/postgresql - if test -d $withval/lib64; then - POSTGRESQL_LIBDIR=$withval/lib64 - else - POSTGRESQL_LIBDIR=$withval/lib - fi + if test -d $withval/lib64; then + POSTGRESQL_LIBDIR=$withval/lib64 + else + POSTGRESQL_LIBDIR=$withval/lib + fi POSTGRESQL_BINDIR=$withval/bin else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error "Invalid PostgreSQL directory $withval - unable to find libpq-fe.h under $withval" "$LINENO" 5 fi - $as_echo "#define HAVE_POSTGRESQL 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "#define HAVE_POSTGRESQL 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - POSTGRESQL_LFLAGS="-L$POSTGRESQL_LIBDIR -lpq" - ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt" + + POSTGRESQL_INCLUDE=-I$POSTGRESQL_INCDIR + POSTGRESQL_LIBS="-R $POSTGRESQL_LIBDIR -L$POSTGRESQL_LIBDIR -lpq" + ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt" if test "x$ac_cv_func_crypt" = x""yes; then : else @@ -22907,22 +22964,26 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5 $as_echo "$ac_cv_lib_crypt_crypt" >&6; } if test "x$ac_cv_lib_crypt_crypt" = x""yes; then : - POSTGRESQL_LFLAGS="$POSTGRESQL_LFLAGS -lcrypt" + POSTGRESQL_LIBS="$POSTGRESQL_LIBS -lcrypt" fi fi - SQL_INCLUDE=-I$POSTGRESQL_INCDIR - SQL_LFLAGS=$POSTGRESQL_LFLAGS - SQL_BINDIR=$POSTGRESQL_BINDIR - SQL_LIB=$POSTGRESQL_LIBDIR/libpq.a + POSTGRESQL_LIB=$POSTGRESQL_LIBDIR/libpq.a + DB_LIBS="${DB_LIBS} ${POSTGRESQL_LIBS}" - db_found=yes - support_postgresql=yes - db_type=PostgreSQL - DB_TYPE=postgresql + if test -z "${db_backends}"; then + db_backends="PostgreSQL" + else + db_backends="${db_backends} PostgreSQL" + fi + if test -z "${DB_BACKENDS}"; then + DB_BACKENDS="postgresql" + else + DB_BACKENDS="${DB_BACKENDS} postgresql" + fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -22940,7 +23001,6 @@ fi -db_found=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL support" >&5 $as_echo_n "checking for MySQL support... " >&6; } @@ -23036,28 +23096,35 @@ $as_echo "no" >&6; } as_fn_error "Invalid MySQL directory $withval - unable to find mysql.h under $withval" "$LINENO" 5 fi fi - SQL_INCLUDE=-I$MYSQL_INCDIR - if test -f $MYSQL_LIBDIR/libmysqlclient_r.a \ - -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then - SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz" - $as_echo "#define HAVE_THREAD_SAFE_MYSQL 1" >>confdefs.h + 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" - fi - SQL_BINDIR=$MYSQL_BINDIR - SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a +$as_echo "#define HAVE_THREAD_SAFE_MYSQL 1" >>confdefs.h + + DB_LIBS="${DB_LIBS} ${MYSQL_LIBS}" + fi + MYSQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a $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; } - db_found=yes - support_mysql=yes - db_type=MySQL - DB_TYPE=mysql + 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 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -23139,95 +23206,35 @@ $as_echo "no" >&6; } as_fn_error "Invalid MySQL directory $withval - unable to find mysql.h under $withval" "$LINENO" 5 fi fi - SQL_INCLUDE=-I$MYSQL_INCDIR - SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt" - SQL_BINDIR=$MYSQL_BINDIR - SQL_LIB=$MYSQL_LIBDIR/libmysqld.a - - $as_echo "#define HAVE_MYSQL 1" >>confdefs.h - - $as_echo "#define HAVE_EMBEDDED_MYSQL 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - db_found=yes - support_mysql=yes - db_type=MySQL - DB_TYPE=mysql - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - - -fi - - - - - - - - + MYSQL_INCLUDE=-I$MYSQL_INCDIR + MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt" + MYSQL_LIB=$MYSQL_LIBDIR/libmysqld.a + DB_LIBS="${DB_LIBS} ${MYSQL_LIBS}" -db_found=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ingres support" >&5 -$as_echo_n "checking for Ingres support... " >&6; } +$as_echo "#define HAVE_MYSQL 1" >>confdefs.h -# Check whether --with-ingres was given. -if test "${with_ingres+set}" = set; then : - withval=$with_ingres; - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - if test -f ${II_SYSTEM}/files/eqdefc.h; then - INGRES_INCDIR=${II_SYSTEM}/files - INGRES_LIBDIR=${II_SYSTEM}/lib - INGRES_BINDIR=${II_SYSTEM}/bin - elif test -f ${II_SYSTEM}/ingres/files/eqdefc.h; then - INGRES_INCDIR=${II_SYSTEM}/ingres/files - INGRES_LIBDIR=${II_SYSTEM}/ingres/lib - INGRES_BINDIR=${II_SYSTEM}/ingres/bin - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error "Unable to find eqdefc.h in standard locations" "$LINENO" 5 - fi - else - if test -f $withval/files/eqdefc.h; then - INGRES_INCDIR=$withval/files - INGRES_LIBDIR=$withval/lib - INGRES_BINDIR=$withval/bin - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error "Invalid Ingres directory $withval - unable to find Ingres headers under $withval" "$LINENO" 5 - fi - fi - SQL_INCLUDE=-I$INGRES_INCDIR - SQL_LFLAGS="-L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1" - SQL_BINDIR=$INGRES_BINDIR - SQL_LIB=$INGRES_LIBDIR/libingres.a -$as_echo "#define HAVE_INGRES 1" >>confdefs.h +$as_echo "#define HAVE_EMBEDDED_MYSQL 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - db_found=yes - support_ingres=yes - db_type=Ingres - DB_TYPE=ingres + 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 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 @@ -23238,7 +23245,7 @@ fi -db_found=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLite3 support" >&5 $as_echo_n "checking for SQLite3 support... " >&6; } @@ -23295,20 +23302,27 @@ $as_echo "no" >&6; } as_fn_error "Invalid SQLite3 directory $withval - unable to find sqlite3.h under $withval" "$LINENO" 5 fi fi - SQL_INCLUDE=-I$SQLITE_INCDIR - SQL_LFLAGS="-L$SQLITE_LIBDIR -lsqlite3" - SQL_BINDIR=$SQLITE_BINDIR - SQL_LIB=$SQLITE_LIBDIR/libsqlite3.a + SQLITE_INCLUDE=-I$SQLITE_INCDIR + SQLITE_LIBS="-R $SQLITE_LIBDIR -L$SQLITE_LIBDIR -lsqlite3" + SQLITE_LIB=$SQLITE_LIBDIR/libsqlite3.a + DB_LIBS="${DB_LIBS} ${SQLITE_LIBS}" - $as_echo "#define HAVE_SQLITE3 1" >>confdefs.h + +$as_echo "#define HAVE_SQLITE3 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - db_found=yes - support_sqlite3=yes - db_type=SQLite3 - DB_TYPE=sqlite3 + 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 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -23327,10 +23341,77 @@ fi -# BA_CHECK_SQLITE_DB + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ingres support" >&5 +$as_echo_n "checking for Ingres support... " >&6; } + +# Check whether --with-ingres was given. +if test "${with_ingres+set}" = set; then : + withval=$with_ingres; + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + if test -f ${II_SYSTEM}/files/eqdefc.h; then + INGRES_INCDIR=${II_SYSTEM}/files + INGRES_LIBDIR=${II_SYSTEM}/lib + INGRES_BINDIR=${II_SYSTEM}/bin + elif test -f ${II_SYSTEM}/ingres/files/eqdefc.h; then + INGRES_INCDIR=${II_SYSTEM}/ingres/files + INGRES_LIBDIR=${II_SYSTEM}/ingres/lib + INGRES_BINDIR=${II_SYSTEM}/ingres/bin + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error "Unable to find eqdefc.h in standard locations" "$LINENO" 5 + fi + else + if test -f $withval/files/eqdefc.h; then + INGRES_INCDIR=$withval/files + INGRES_LIBDIR=$withval/lib + INGRES_BINDIR=$withval/bin + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error "Invalid Ingres directory $withval - unable to find Ingres headers under $withval" "$LINENO" 5 + fi + fi + INGRES_INCLUDE=-I$INGRES_INCDIR + INGRES_LIBS="-R $INGRES_LIBDIR -L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1" + DB_LIBS="${DB_LIBS} ${INGRES_LIBS}" + +$as_echo "#define HAVE_INGRES 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="Ingres" + else + db_backends="${db_backends} Ingres" + fi + if test -z "${DB_BACKENDS}"; then + DB_BACKENDS="ingres" + else + DB_BACKENDS="${DB_BACKENDS} ingres" + 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 + + + + + + -db_found=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBI support" >&5 $as_echo_n "checking for DBI support... " >&6; } @@ -23433,21 +23514,28 @@ $as_echo "no" >&6; } as_fn_error "Invalid DBD driver directory $withval - unable to find DBD drivers under $withval" "$LINENO" 5 fi fi - SQL_INCLUDE=-I$DBI_INCDIR - SQL_LFLAGS="-L$DBI_LIBDIR -ldbi" - SQL_BINDIR=$DBI_BINDIR - SQL_LIB=$DBI_LIBDIR/libdbi.a + DBI_INCLUDE=-I$DBI_INCDIR + DBI_LIBS="-R $DBI_LIBDIR -L$DBI_LIBDIR -ldbi" + DBI_LIB=$DBI_LIBDIR/libdbi.a DBI_DBD_DRIVERDIR="-D DBI_DRIVER_DIR=\\\"$DRIVERDIR\\\"" + DB_LIBS="${DB_LIBS} ${DBI_LIBS}" $as_echo "#define HAVE_DBI 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - db_found=yes - support_dbi=yes - db_type=DBI - DB_TYPE=dbi + + if test -z "${db_backends}"; then + db_backends="DBI" + else + db_backends="${db_backends} DBI" + fi + if test -z "${DB_BACKENDS}" ; then + DB_BACKENDS="dbi" + else + DB_BACKENDS="${DB_BACKENDS} dbi" + fi uncomment_dbi=" " else @@ -23471,7 +23559,7 @@ fi -db_found=no + db_prog=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBI drivers support" >&5 $as_echo_n "checking for DBI drivers support... " >&6; } @@ -23487,45 +23575,45 @@ if test "${with_dbi_driver+set}" = set; then : SQL_BINDIR=/usr/local/mysql/bin if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a \ -o -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.so; then - SQL_LIBDIR=/usr/local/mysql/lib64/mysql + MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql else - SQL_LIBDIR=/usr/local/mysql/lib/mysql + MYSQL_LIBDIR=/usr/local/mysql/lib/mysql fi elif test -f /usr/bin/mysql; then SQL_BINDIR=/usr/bin if test -f /usr/lib64/mysql/libmysqlclient_r.a \ -o -f /usr/lib64/mysql/libmysqlclient_r.so; then - SQL_LIBDIR=/usr/lib64/mysql + MYSQL_LIBDIR=/usr/lib64/mysql elif test -f /usr/lib/mysql/libmysqlclient_r.a \ -o -f /usr/lib/mysql/libmysqlclient_r.so; then - SQL_LIBDIR=/usr/lib/mysql + MYSQL_LIBDIR=/usr/lib/mysql else - SQL_LIBDIR=/usr/lib + MYSQL_LIBDIR=/usr/lib fi elif test -f /usr/local/bin/mysql; then SQL_BINDIR=/usr/local/bin if test -f /usr/local/lib64/mysql/libmysqlclient_r.a \ -o -f /usr/local/lib64/mysql/libmysqlclient_r.so; then - SQL_LIBDIR=/usr/local/lib64/mysql + MYSQL_LIBDIR=/usr/local/lib64/mysql elif test -f /usr/local/lib/mysql/libmysqlclient_r.a \ -o -f /usr/local/lib/mysql/libmysqlclient_r.so; then - SQL_LIBDIR=/usr/local/lib/mysql + MYSQL_LIBDIR=/usr/local/lib/mysql else - SQL_LIBDIR=/usr/local/lib + MYSQL_LIBDIR=/usr/local/lib fi elif test -f $withval/bin/mysql; then SQL_BINDIR=$withval/bin if test -f $withval/lib64/mysql/libmysqlclient_r.a \ -o -f $withval/lib64/mysql/libmysqlclient_r.so; then - SQL_LIBDIR=$withval/lib64/mysql + MYSQL_LIBDIR=$withval/lib64/mysql elif test -f $withval/lib64/libmysqlclient_r.a \ -o -f $withval/lib64/libmysqlclient_r.so; then - SQL_LIBDIR=$withval/lib64 + MYSQL_LIBDIR=$withval/lib64 elif test -f $withval/lib/libmysqlclient_r.a \ -o -f $withval/lib/libmysqlclient_r.so; then - SQL_LIBDIR=$withval/lib/ + MYSQL_LIBDIR=$withval/lib/ else - SQL_LIBDIR=$withval/lib/mysql + MYSQL_LIBDIR=$withval/lib/mysql fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -23542,110 +23630,76 @@ $as_echo "no" >&6; } db_prog="postgresql" PG_CONFIG=`which pg_config` if test -n "$PG_CONFIG"; then - SQL_BINDIR=`"$PG_CONFIG" --bindir` - SQL_LIBDIR=`"$PG_CONFIG" --libdir` + POSTGRESQL_BINDIR=`"$PG_CONFIG" --bindir` + POSTGRESQL_LIBDIR=`"$PG_CONFIG" --libdir` elif test -f /usr/local/bin/psql; then - SQL_BINDIR=/usr/local/bin + POSTGRESQL_BINDIR=/usr/local/bin if test -d /usr/local/lib64; then - SQL_LIBDIR=/usr/local/lib64 + POSTGRESQL_LIBDIR=/usr/local/lib64 else - SQL_LIBDIR=/usr/local/lib + POSTGRESQL_LIBDIR=/usr/local/lib fi elif test -f /usr/bin/psql; then - SQL_BINDIR=/usr/local/bin + POSTGRESQL_BINDIR=/usr/local/bin if test -d /usr/lib64/postgresql; then - SQL_LIBDIR=/usr/lib64/postgresql + POSTGRESQL_LIBDIR=/usr/lib64/postgresql elif test -d /usr/lib/postgresql; then - SQL_LIBDIR=/usr/lib/postgresql + POSTGRESQL_LIBDIR=/usr/lib/postgresql elif test -d /usr/lib64; then - SQL_LIBDIR=/usr/lib64 + POSTGRESQL_LIBDIR=/usr/lib64 else - SQL_LIBDIR=/usr/lib + POSTGRESQL_LIBDIR=/usr/lib fi elif test -f $withval/bin/psql; then - SQL_BINDIR=$withval/bin + POSTGRESQL_BINDIR=$withval/bin if test -d $withval/lib64; then - SQL_LIBDIR=$withval/lib64 + POSTGRESQL_LIBDIR=$withval/lib64 else - SQL_LIBDIR=$withval/lib + POSTGRESQL_LIBDIR=$withval/lib fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error "Unable to find psql in standard locations" "$LINENO" 5 fi - if test -f $SQL_LIBDIR/libpq.so; then - DB_PROG_LIB=$SQL_LIBDIR/libpq.so + if test -f $POSTGRESQL_LIBDIR/libpq.so; then + DB_PROG_LIB=$POSTGRESQL_LIBDIR/libpq.so else - DB_PROG_LIB=$SQL_LIBDIR/libpq.a - fi - ;; - "sqlite") - db_prog="sqlite" - if test -f /usr/local/bin/sqlite; then - SQL_BINDIR=/usr/local/bin - if test -d /usr/local/lib64; then - SQL_LIBDIR=/usr/local/lib64 - else - SQL_LIBDIR=/usr/local/lib - fi - elif test -f /usr/bin/sqlite; then - SQL_BINDIR=/usr/bin - if test -d /usr/lib64; then - SQL_LIBDIR=/usr/lib64 - else - SQL_LIBDIR=/usr/lib - fi - elif test -f $withval/bin/sqlite; then - SQL_BINDIR=$withval/bin - if test -d $withval/lib64; then - SQL_LIBDIR=$withval/lib64 - else - SQL_LIBDIR=$withval/lib - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error "Unable to find sqlite in standard locations" "$LINENO" 5 - fi - if test -f $SQL_LIBDIR/libsqlite.so; then - DB_PROG_LIB=$SQL_LIBDIR/libsqlite.so - else - DB_PROG_LIB=$SQL_LIBDIR/libsqlite.a + DB_PROG_LIB=$POSTGRESQL_LIBDIR/libpq.a fi ;; "sqlite3") db_prog="sqlite3" if test -f /usr/local/bin/sqlite3; then - SQL_BINDIR=/usr/local/bin + SQLITE_BINDIR=/usr/local/bin if test -d /usr/local/lib64; then - SQL_LIBDIR=/usr/local/lib64 + SQLITE_LIBDIR=/usr/local/lib64 else - SQL_LIBDIR=/usr/local/lib + SQLITE_LIBDIR=/usr/local/lib fi elif test -f /usr/bin/sqlite3; then - SQL_BINDIR=/usr/bin + SQLITE_BINDIR=/usr/bin if test -d /usr/lib64; then - SQL_LIBDIR=/usr/lib64 + SQLITE_LIBDIR=/usr/lib64 else - SQL_LIBDIR=/usr/lib + SQLITE_LIBDIR=/usr/lib fi elif test -f $withval/bin/sqlite3; then - SQL_BINDIR=$withval/bin + SQLITE_BINDIR=$withval/bin if test -d $withval/lib64; then - SQL_LIBDIR=$withval/lib64 + SQLITE_LIBDIR=$withval/lib64 else - SQL_LIBDIR=$withval/lib + SQLITE_LIBDIR=$withval/lib fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error "Unable to find sqlite in standard locations" "$LINENO" 5 fi - if test -f $SQL_LIBDIR/libsqlite3.so; then - DB_PROG_LIB=$SQL_LIBDIR/libsqlite3.so + if test -f $SQLITE_LIBDIR/libsqlite3.so; then + DB_PROG_LIB=$SQLITE_LIBDIR/libsqlite3.so else - DB_PROG_LIB=$SQL_LIBDIR/libsqlite3.a + DB_PROG_LIB=$SQLITE_LIBDIR/libsqlite3.a fi ;; *) @@ -23679,33 +23733,91 @@ fi -support_batch_insert=no -A=`test -f $SQL_LIB && nm $SQL_LIB | grep pthread_mutex_lock` -pkg=$? -if test $pkg = 0; then - support_batch_insert=yes - # Check whether --enable-batch-insert was given. +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, Ingres, SQLite3 or DBI." + echo "This is not permitted. Please reconfigure." + echo " " + echo "Aborting the configuration ..." + echo " " + echo " " + exit 1 +fi + +case `echo $DB_BACKENDS | wc -w | sed -e 's/^ *//'` in + 1) + DEFAULT_DB_TYPE="${DB_BACKENDS}" + if test x$use_libtool = xno; then + SHARED_CATALOG_TARGETS="" + else + SHARED_CATALOG_TARGETS="libbaccats-${DEFAULT_DB_TYPE}.la" + fi + ;; + *) + DEFAULT_DB_TYPE=`echo ${DB_BACKENDS} | cut -d' ' -f1` + + if test x$use_libtool = xno; then + echo " " + echo " " + echo "You have specified two or more of the" + echo "supported databases: MySQL, PostgreSQL, Ingres, SQLite3 or DBI." + echo "This is not permitted when not using libtool Please reconfigure." + echo " " + echo "Aborting the configuration ..." + echo " " + echo " " + exit 1 + fi + + SHARED_CATALOG_TARGETS="" + for db_type in ${DB_BACKENDS} + do + if test -z "${SHARED_CATALOG_TARGETS}"; then + SHARED_CATALOG_TARGETS="libbaccats-${db_type}.la" + else + SHARED_CATALOG_TARGETS="${SHARED_CATALOG_TARGETS} libbaccats-${db_type}.la" + fi + done + ;; +esac + +if test x$use_libtool = xyes; then + DB_LIBS="" +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 - else - support_batch_insert=yes - fi + 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 x$DB_TYPE = xpostgresql; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQisthreadsafe in -lpq" >&5 -$as_echo_n "checking for PQisthreadsafe in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQisthreadsafe+set}" = set; then : +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 test "${ac_cv_lib_mysql_r_mysql_thread_safe+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpq $LIBS" +LIBS="-lmysql_r $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -23715,39 +23827,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char PQisthreadsafe (); +char mysql_thread_safe (); int main () { -return PQisthreadsafe (); +return mysql_thread_safe (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_pq_PQisthreadsafe=yes + ac_cv_lib_mysql_r_mysql_thread_safe=yes else - ac_cv_lib_pq_PQisthreadsafe=no + 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_pq_PQisthreadsafe" >&5 -$as_echo "$ac_cv_lib_pq_PQisthreadsafe" >&6; } -if test "x$ac_cv_lib_pq_PQisthreadsafe" = x""yes; then : +{ $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" = x""yes; then : -$as_echo "#define HAVE_PQISTHREADSAFE 1" >>confdefs.h +$as_echo "#define HAVE_MYSQL_THREAD_SAFE 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 test "${ac_cv_lib_pq_PQputCopyData+set}" = set; then : +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 test "${ac_cv_lib_sqlite3_sqlite3_threadsafe+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpq $LIBS" +LIBS="-lsqlite3 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -23757,44 +23872,39 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char PQputCopyData (); +char sqlite3_threadsafe (); int main () { -return PQputCopyData (); +return sqlite3_threadsafe (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_pq_PQputCopyData=yes + ac_cv_lib_sqlite3_sqlite3_threadsafe=yes else - ac_cv_lib_pq_PQputCopyData=no + 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_pq_PQputCopyData" >&5 -$as_echo "$ac_cv_lib_pq_PQputCopyData" >&6; } -if test "x$ac_cv_lib_pq_PQputCopyData" = x""yes; then : +{ $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" = x""yes; then : -$as_echo "#define HAVE_PQ_COPY 1" >>confdefs.h +$as_echo "#define HAVE_SQLITE3_THREADSAFE 1" >>confdefs.h fi - if test "x$ac_cv_lib_pq_PQputCopyData" != "xyes" - then - support_batch_insert=no - fi fi -if test x$DB_TYPE = xdbi; then - DB_TYPE=$DB_PROG - db_type=$DB_PROG - pkg=1 - if test $DB_PROG = postgresql; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQisthreadsafe in -lpq" >&5 +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 test "${ac_cv_lib_pq_PQisthreadsafe+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -23831,11 +23941,12 @@ 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" = x""yes; then : - $as_echo "#define HAVE_PQISTHREADSAFE 1" >>confdefs.h + +$as_echo "#define HAVE_PQISTHREADSAFE 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQputCopyData in -lpq" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQputCopyData in -lpq" >&5 $as_echo_n "checking for PQputCopyData in -lpq... " >&6; } if test "${ac_cv_lib_pq_PQputCopyData+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -23872,29 +23983,41 @@ 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" = x""yes; then : - $as_echo "#define HAVE_PQ_COPY 1" >>confdefs.h + +$as_echo "#define HAVE_PQ_COPY 1" >>confdefs.h fi - test "x$ac_cv_lib_pq_PQputCopyData" != "xyes" - pkg=$? + 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 $DB_PROG = mysql; then - A=`test -f $SQL_LIB && nm $DB_PROG_LIB | grep pthread_mutex_lock` - pkg=$? + 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 - if test $DB_PROG = sqlite3; then - A=`test -f $SQL_LIB && nm $DB_PROG_LIB | grep pthread_mutex_lock` - pkg=$? - { $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 test "${ac_cv_lib_sqlite3_sqlite3_threadsafe+set}" = set; then : + 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 test "${ac_cv_lib_pq_PQisthreadsafe+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsqlite3 $LIBS" +LIBS="-lpq $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -23904,63 +24027,87 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char sqlite3_threadsafe (); +char PQisthreadsafe (); int main () { -return sqlite3_threadsafe (); +return PQisthreadsafe (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_sqlite3_sqlite3_threadsafe=yes + ac_cv_lib_pq_PQisthreadsafe=yes else - ac_cv_lib_sqlite3_sqlite3_threadsafe=no + 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_sqlite3_sqlite3_threadsafe" >&5 -$as_echo "$ac_cv_lib_sqlite3_sqlite3_threadsafe" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_threadsafe" = x""yes; then : - -$as_echo "#define HAVE_SQLITE3_THREADSAFE 1" >>confdefs.h +{ $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" = x""yes; then : + $as_echo "#define HAVE_PQISTHREADSAFE 1" >>confdefs.h fi - fi - - if test $pkg = 0; then - # 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 - else - support_batch_insert=yes - fi - + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQputCopyData in -lpq" >&5 +$as_echo_n "checking for PQputCopyData in -lpq... " >&6; } +if test "${ac_cv_lib_pq_PQputCopyData+set}" = set; 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" = x""yes; then : + $as_echo "#define HAVE_PQ_COPY 1" >>confdefs.h - fi -else - uncomment_dbi="#" 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 -if test x$DB_TYPE = xingres; then - support_batch_insert=yes + fi + fi + fi +else + uncomment_dbi="#" fi -if test $support_batch_insert = yes ; then -$as_echo "#define HAVE_BATCH_FILE_INSERT 1" >>confdefs.h - -fi $as_echo "#define PROTOTYPES 1" >>confdefs.h @@ -25838,6 +25985,234 @@ $as_echo "#define const /**/" >>confdefs.h fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if test "${ac_cv_c_bigendian+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + # Check for potential -arch flags. It is not universal unless + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + +int +main () +{ +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ + && LITTLE_ENDIAN) + bogus endian macros + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + +int +main () +{ +#if BYTE_ORDER != BIG_ENDIAN + not big endian + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes +else + ac_cv_c_bigendian=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main () +{ +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main () +{ +#ifndef _BIG_ENDIAN + not big endian + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes +else + ac_cv_c_bigendian=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. + if test "$cross_compiling" = yes; then : + # Try to guess by grepping values from an object file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; + short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } + extern int foo; + +int +main () +{ +return use_ascii (foo) == use_ebcdic (foo); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi + fi +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_c_bigendian=no +else + ac_cv_c_bigendian=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) + +$as_echo "#define HAVE_BIG_ENDIAN 1" >>confdefs.h +;; #( + no) + +$as_echo "#define HAVE_LITTLE_ENDIAN 1" >>confdefs.h + ;; #( + universal) + +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h + + ;; #( + *) + as_fn_error "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get filesystem type" >&5 $as_echo_n "checking how to get filesystem type... " >&6; } fstype=no @@ -27181,6 +27556,34 @@ fi done +for ac_func in getpagesize +do : + ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" +if test "x$ac_cv_func_getpagesize" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETPAGESIZE 1 +_ACEOF + +$as_echo "#define HAVE_GETPAGESIZE 1" >>confdefs.h + +fi +done + + +for ac_func in malloc_trim +do : + ac_fn_c_check_func "$LINENO" "malloc_trim" "ac_cv_func_malloc_trim" +if test "x$ac_cv_func_malloc_trim" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MALLOC_TRIM 1 +_ACEOF + +$as_echo "#define HAVE_MALLOC_TRIM 1" >>confdefs.h + +fi +done + + for ac_func in fchdir do : ac_fn_c_check_func "$LINENO" "fchdir" "ac_cv_func_fchdir" @@ -28089,10 +28492,10 @@ fi if test x$with_afsdir = x; then for root in /usr /usr/local; do - if test -d ${root}/include/afs/ ; then - with_afsdir=${root} - break - fi + if test -d ${root}/include/afs/ ; then + with_afsdir=${root} + break + fi done fi @@ -28120,13 +28523,13 @@ done do for arch_type in .a .so do - A=`test -f ${dir}/libsys${arch_type} && nm ${dir}/libsys${arch_type} | grep pioctl` - pkg=$? - if test $pkg = 0; then - have_afs=yes - AFS_LIBS="-L${dir} -lsys -lrx -llwp ${dir}/util.a" - break - fi + A=`test -f ${dir}/libsys${arch_type} && nm ${dir}/libsys${arch_type} | grep pioctl` + pkg=$? + if test $pkg = 0; then + have_afs=yes + AFS_LIBS="-L${dir} -lsys -lrx -llwp ${dir}/util.a" + break + fi done done @@ -28147,10 +28550,6 @@ fi -$as_echo "#define AFS_CFLAGS 1" >>confdefs.h - -$as_echo "#define AFS_LIBS 1" >>confdefs.h - support_acl=auto # Check whether --enable-acl was given. @@ -28177,14 +28576,18 @@ $as_echo "#define HAVE_SYS_ACL_H 1" >>confdefs.h fi - ac_fn_c_check_func "$LINENO" "acl_get_file" "ac_cv_func_acl_get_file" + + ac_fn_c_check_func "$LINENO" "acl_get_file" "ac_cv_func_acl_get_file" if test "x$ac_cv_func_acl_get_file" = x""yes; then : have_acl=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5 +fi + + + if test $have_acl = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5 $as_echo_n "checking for acl_get_file in -lacl... " >&6; } if test "${ac_cv_lib_acl_acl_get_file+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -28222,20 +28625,24 @@ fi $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; } if test "x$ac_cv_lib_acl_acl_get_file" = x""yes; then : - have_acl=yes; - if test $have_afs = yes; then - if test -d /usr/lib64/; then - FDLIBS="-L/usr/lib64 -lacl $FDLIBS" - else - FDLIBS="-L/usr/lib -lacl $FDLIBS" - fi - else - FDLIBS="-lacl $FDLIBS" - fi + have_acl=yes + if test $have_afs = yes; then + if test -d /usr/lib64/; then + FDLIBS="-L/usr/lib64 -lacl $FDLIBS" + else + FDLIBS="-L/usr/lib -lacl $FDLIBS" + fi + else + FDLIBS="-lacl $FDLIBS" + fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lpacl" >&5 +fi + + fi + + if test $have_acl = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lpacl" >&5 $as_echo_n "checking for acl_get_file in -lpacl... " >&6; } if test "${ac_cv_lib_pacl_acl_get_file+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -28273,12 +28680,17 @@ fi $as_echo "$ac_cv_lib_pacl_acl_get_file" >&6; } if test "x$ac_cv_lib_pacl_acl_get_file" = x""yes; then : - have_acl=yes; - FDLIBS="-lpacl $FDLIBS" + have_acl=yes + FDLIBS="-lpacl $FDLIBS" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acltotext in -lsec" >&5 +fi + + fi + + if test $have_acl = no -a \ + x${HAVE_SUN_OS_TRUE} = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acltotext in -lsec" >&5 $as_echo_n "checking for acltotext in -lsec... " >&6; } if test "${ac_cv_lib_sec_acltotext+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -28316,10 +28728,10 @@ fi $as_echo "$ac_cv_lib_sec_acltotext" >&6; } if test "x$ac_cv_lib_sec_acltotext" = x""yes; then : - have_acl=yes; - FDLIBS="-lsec $FDLIBS" + have_acl=yes + FDLIBS="-lsec $FDLIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_totext in -lsec" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_totext in -lsec" >&5 $as_echo_n "checking for acl_totext in -lsec... " >&6; } if test "${ac_cv_lib_sec_acl_totext+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -28357,7 +28769,7 @@ fi $as_echo "$ac_cv_lib_sec_acl_totext" >&6; } if test "x$ac_cv_lib_sec_acl_totext" = x""yes; then : - have_extended_acl=yes + have_extended_acl=yes fi @@ -28366,10 +28778,19 @@ fi fi + fi + + if test $have_acl = no -a \ + x${HAVE_AIX_OS_TRUE} = x; then + ac_fn_c_check_func "$LINENO" "acl_get" "ac_cv_func_acl_get" +if test "x$ac_cv_func_acl_get" = x""yes; then : + have_acl=yes -fi + ac_fn_c_check_func "$LINENO" "aclx_get" "ac_cv_func_aclx_get" +if test "x$ac_cv_func_aclx_get" = x""yes; then : + have_extended_acl=yes fi @@ -28378,6 +28799,7 @@ fi fi + fi if test x$support_acl = xyes -a $have_acl != yes; then as_fn_error "acl support explicitly enabled but no supported acl implementation found, @@ -28413,7 +28835,10 @@ fi have_xattr=no if test x$support_xattr = xyes -o x$support_xattr = xauto; then - ac_fn_c_check_header_mongrel "$LINENO" "sys/extattr.h" "ac_cv_header_sys_extattr_h" "$ac_includes_default" + if test x${HAVE_FREEBSD_OS_TRUE} = x -o \ + x${HAVE_NETBSD_OS_TRUE} = x -o \ + x${HAVE_OPENBSD_OS_TRUE} = x; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/extattr.h" "ac_cv_header_sys_extattr_h" "$ac_includes_default" if test "x$ac_cv_header_sys_extattr_h" = x""yes; then : $as_echo "#define HAVE_SYS_EXTATTR_H 1" >>confdefs.h @@ -28421,7 +28846,7 @@ $as_echo "#define HAVE_SYS_EXTATTR_H 1" >>confdefs.h fi - ac_fn_c_check_header_mongrel "$LINENO" "libutil.h" "ac_cv_header_libutil_h" "$ac_includes_default" + ac_fn_c_check_header_mongrel "$LINENO" "libutil.h" "ac_cv_header_libutil_h" "$ac_includes_default" if test "x$ac_cv_header_libutil_h" = x""yes; then : $as_echo "#define HAVE_LIBUTIL_H 1" >>confdefs.h @@ -28429,7 +28854,7 @@ $as_echo "#define HAVE_LIBUTIL_H 1" >>confdefs.h fi - for ac_func in extattr_get_link extattr_set_link extattr_list_link + for ac_func in extattr_get_link extattr_set_link extattr_list_link 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" @@ -28439,7 +28864,7 @@ eval as_val=\$$as_ac_var #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - have_xattr=yes + have_xattr=yes $as_echo "#define HAVE_EXTATTR_GET_LINK 1" >>confdefs.h @@ -28455,8 +28880,8 @@ fi done - if test $have_xattr = no; then - for ac_func in extattr_get_file extattr_set_file extattr_list_file + if test $have_xattr = no; then + for ac_func in extattr_get_file extattr_set_file extattr_list_file 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" @@ -28466,7 +28891,7 @@ eval as_val=\$$as_ac_var #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - have_xattr=yes + have_xattr=yes $as_echo "#define HAVE_EXTATTR_GET_FILE 1" >>confdefs.h @@ -28481,11 +28906,11 @@ $as_echo "#define HAVE_EXTATTR_LIST_FILE 1" >>confdefs.h fi done - fi + fi - if test $have_xattr = yes; then - have_extattr_string_in_libc=no - for ac_func in extattr_namespace_to_string extattr_string_to_namespace + if test $have_xattr = yes; then + have_extattr_string_in_libc=no + for ac_func in extattr_namespace_to_string extattr_string_to_namespace 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" @@ -28495,7 +28920,7 @@ eval as_val=\$$as_ac_var #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - have_extattr_string_in_libc=yes + have_extattr_string_in_libc=yes $as_echo "#define HAVE_EXTATTR_NAMESPACE_TO_STRING 1" >>confdefs.h @@ -28508,8 +28933,8 @@ fi done - if test $have_extattr_string_in_libc = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extattr_namespace_to_string extattr_string_to_namespace in -lutil" >&5 + if test $have_extattr_string_in_libc = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extattr_namespace_to_string extattr_string_to_namespace in -lutil" >&5 $as_echo_n "checking for extattr_namespace_to_string extattr_string_to_namespace in -lutil... " >&6; } if test "${ac_cv_lib_util_extattr_namespace_to_string_extattr_string_to_namespace+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -28553,24 +28978,26 @@ $as_echo "#define HAVE_EXTATTR_NAMESPACE_TO_STRING 1" >>confdefs.h $as_echo "#define HAVE_EXTATTR_STRING_TO_NAMESPACE 1" >>confdefs.h - FDLIBS="-lutil $FDLIBS" + FDLIBS="-lutil $FDLIBS" fi + fi fi fi - if test $have_xattr = no; then - ac_fn_c_check_header_mongrel "$LINENO" "sys/xattr.h" "ac_cv_header_sys_xattr_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_xattr_h" = x""yes; then : + if test $have_xattr = no -a \ + x${HAVE_AIX_OS_TRUE} = x; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/ea.h" "ac_cv_header_sys_ea_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_ea_h" = x""yes; then : -$as_echo "#define HAVE_SYS_XATTR_H 1" >>confdefs.h +$as_echo "#define HAVE_SYS_EA_H 1" >>confdefs.h fi - for ac_func in llistxattr lgetxattr lsetxattr + for ac_func in llistea lgetea lsetea 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" @@ -28582,13 +29009,13 @@ _ACEOF have_xattr=yes -$as_echo "#define HAVE_LLISTXATTR 1" >>confdefs.h +$as_echo "#define HAVE_LLISTEA 1" >>confdefs.h -$as_echo "#define HAVE_LGETXATTR 1" >>confdefs.h +$as_echo "#define HAVE_LGETEA 1" >>confdefs.h -$as_echo "#define HAVE_LSETXATTR 1" >>confdefs.h +$as_echo "#define HAVE_LSETEA 1" >>confdefs.h @@ -28597,7 +29024,7 @@ done if test $have_xattr = no; then - for ac_func in listxattr getxattr setxattr + for ac_func in listea getea setea 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" @@ -28609,13 +29036,13 @@ _ACEOF have_xattr=yes -$as_echo "#define HAVE_LISTXATTR 1" >>confdefs.h +$as_echo "#define HAVE_LISTEA 1" >>confdefs.h -$as_echo "#define HAVE_GETXATTR 1" >>confdefs.h +$as_echo "#define HAVE_GETEA 1" >>confdefs.h -$as_echo "#define HAVE_SETXATTR 1" >>confdefs.h +$as_echo "#define HAVE_SETEA 1" >>confdefs.h @@ -28625,7 +29052,51 @@ done fi fi - if test $have_xattr = no; then + if test $have_xattr = no -a \ + x${HAVE_OSF1_OS_TRUE} = x; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/proplist.h" "ac_cv_header_sys_proplist_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_proplist_h" = x""yes; then : + +$as_echo "#define HAVE_SYS_PROPLIST_H 1" >>confdefs.h + +fi + + + for ac_func in getproplist get_proplist_entry sizeof_proplist_entry add_proplist_entry setproplist +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" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + + have_xattr=yes + +$as_echo "#define HAVE_GETPROPLIST 1" >>confdefs.h + + +$as_echo "#define HAVE_GET_PROPLIST_ENTRY 1" >>confdefs.h + + +$as_echo "#define HAVE_SIZEOF_PROPLIST_ENTRY 1" >>confdefs.h + + +$as_echo "#define HAVE_ADD_PROPLIST_ENTRY 1" >>confdefs.h + + +$as_echo "#define HAVE_SETPROPLIST 1" >>confdefs.h + + + +fi +done + + fi + + if test $have_xattr = no -a \ + x${HAVE_SUN_OS_TRUE} = x; then ac_fn_c_check_header_mongrel "$LINENO" "sys/attr.h" "ac_cv_header_sys_attr_h" "$ac_includes_default" if test "x$ac_cv_header_sys_attr_h" = x""yes; then : @@ -28730,6 +29201,70 @@ $as_echo "#define HAVE_NVLIST_NEXT_NVPAIR 1" >>confdefs.h fi + fi + fi + + if test $have_xattr = no; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/xattr.h" "ac_cv_header_sys_xattr_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_xattr_h" = x""yes; then : + +$as_echo "#define HAVE_SYS_XATTR_H 1" >>confdefs.h + +fi + + + for ac_func in llistxattr lgetxattr lsetxattr +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" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + + have_xattr=yes + +$as_echo "#define HAVE_LLISTXATTR 1" >>confdefs.h + + +$as_echo "#define HAVE_LGETXATTR 1" >>confdefs.h + + +$as_echo "#define HAVE_LSETXATTR 1" >>confdefs.h + + + +fi +done + + + if test $have_xattr = no; then + for ac_func in listxattr getxattr setxattr +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" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + + have_xattr=yes + +$as_echo "#define HAVE_LISTXATTR 1" >>confdefs.h + + +$as_echo "#define HAVE_GETXATTR 1" >>confdefs.h + + +$as_echo "#define HAVE_SETXATTR 1" >>confdefs.h + + + +fi +done + fi fi @@ -28971,7 +29506,6 @@ if test x$have_gcc = xyes ; then CFLAGS="$CFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti" fi LDFLAGS=${LDFLAGS--O} -DB_LIBS="${SQL_LFLAGS}" CPPFLAGS="$CPPFLAGS" CFLAGS="$CFLAGS" @@ -28989,7 +29523,6 @@ CFLAGS="$CFLAGS" - OBJLIST= @@ -29303,7 +29836,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi -ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole 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/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/create_ingres_database src/cats/update_ingres_tables src/cats/make_ingres_tables src/cats/grant_ingres_privileges src/cats/drop_ingres_tables src/cats/drop_ingres_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/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 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/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/create_ingres_database src/cats/update_ingres_tables src/cats/make_ingres_tables src/cats/grant_ingres_privileges src/cats/drop_ingres_tables src/cats/drop_ingres_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/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_commands="$ac_config_commands default" @@ -29405,6 +29938,7 @@ LTLIBOBJS=$ac_ltlibobjs + : ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files @@ -30363,13 +30897,8 @@ do "autoconf/Make.common") CONFIG_FILES="$CONFIG_FILES autoconf/Make.common" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "manpages/Makefile") CONFIG_FILES="$CONFIG_FILES manpages/Makefile" ;; - "scripts/startmysql") CONFIG_FILES="$CONFIG_FILES scripts/startmysql" ;; - "scripts/stopmysql") CONFIG_FILES="$CONFIG_FILES scripts/stopmysql" ;; "scripts/btraceback") CONFIG_FILES="$CONFIG_FILES scripts/btraceback" ;; - "scripts/startit") CONFIG_FILES="$CONFIG_FILES scripts/startit" ;; - "scripts/stopit") CONFIG_FILES="$CONFIG_FILES scripts/stopit" ;; "scripts/bconsole") CONFIG_FILES="$CONFIG_FILES scripts/bconsole" ;; - "scripts/gconsole") CONFIG_FILES="$CONFIG_FILES scripts/gconsole" ;; "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" ;; @@ -30402,6 +30931,8 @@ do "src/host.h") CONFIG_FILES="$CONFIG_FILES src/host.h" ;; "src/console/Makefile") CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;; "src/console/bconsole.conf") CONFIG_FILES="$CONFIG_FILES src/console/bconsole.conf" ;; + "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.conf") CONFIG_FILES="$CONFIG_FILES src/qt-console/tray-monitor/tray-monitor.conf" ;; "src/qt-console/bat.conf") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.conf" ;; "src/qt-console/bat.pro") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.pro" ;; "src/qt-console/bat.pro.mingw32") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.pro.mingw32" ;; @@ -30466,6 +30997,9 @@ do "updatedb/update_mysql_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_mysql_tables_10_to_11" ;; "updatedb/update_sqlite3_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite3_tables_10_to_11" ;; "updatedb/update_postgresql_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_postgresql_tables_10_to_11" ;; + "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" ;; "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" ;; @@ -32012,13 +32546,12 @@ if test "${support_bat}" = "yes" ; then as_fn_error "Could not find qmake $PATH. Check your Qt installation" "$LINENO" 5 fi - QMAKEBIN="qmake" cd src/qt-console echo "Creating bat Makefile" touch bat chmod 755 bat rm -f Makefile - $QMAKEBIN + $QMAKE ${MAKE:-make} clean cd ${BUILD_DIR} fi @@ -32033,23 +32566,23 @@ chmod 755 install_conf_file build-depkgs-qt-console cd ${BUILD_DIR} cd scripts -chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer +chmod 755 bacula btraceback mtx-changer chmod 755 dvd-handler dvd-simulator -chmod 755 bconsole gconsole mtx-changer devel_bacula logrotate +chmod 755 bconsole mtx-changer devel_bacula logrotate cd .. c=updatedb chmod 755 $c/update_mysql_tables_10_to_11 $c/update_sqlite3_tables_10_to_11 chmod 755 $c/update_postgresql_tables_10_to_11 +chmod 755 $c/update_mysql_tables_11_to_12 $c/update_sqlite3_tables_11_to_12 +chmod 755 $c/update_postgresql_tables_11_to_12 + c=src/cats chmod 755 $c/create_bacula_database $c/update_bacula_tables $c/make_bacula_tables chmod 755 $c/grant_bacula_privileges $c/drop_bacula_tables $c/drop_bacula_database -chmod 755 $c/create_bdb_database $c/update_bdb_tables $c/make_bdb_tables -chmod 755 $c/grant_bdb_privileges $c/drop_bdb_tables $c/drop_bdb_database - chmod 755 $c/create_mysql_database $c/update_mysql_tables $c/make_mysql_tables chmod 755 $c/grant_mysql_privileges $c/drop_mysql_tables $c/drop_mysql_database @@ -32090,68 +32623,52 @@ echo "Cleaning up" echo " " ${MAKE:-make} clean -if test "x${db_type}" = "xInternal" ; then - echo " " - echo " " - echo "You have not specified either --enable-client-only or one of the" - echo " supported databases: MySQL, PostgreSQL, Ingres, SQLite3 or DBI." - echo " This is not permitted. Please reconfigure." - echo " " - echo "Aborting the configuration ..." - echo " " - echo " " - exit 1 -fi - echo " Configuration on `date`: - Host: ${host}${post_host} -- ${DISTNAME} ${DISTVER} - Bacula version: ${BACULA} ${VERSION} (${DATE}) - Source code location: ${srcdir} - Install binaries: ${sbindir} - Install libraries: ${libdir} - Install config files: ${sysconfdir} - Scripts directory: ${scriptdir} - Archive directory: ${archivedir} - Working directory: ${working_dir} - PID directory: ${piddir} - Subsys directory: ${subsysdir} - Man directory: ${mandir} - Data directory: ${datarootdir} - Plugin directory: ${plugindir} - C Compiler: ${CC} ${CCVERSION} - C++ Compiler: ${CXX} ${CXXVERSION} - Compiler flags: ${WCFLAGS} ${CFLAGS} - Linker flags: ${WLDFLAGS} ${LDFLAGS} - Libraries: ${LIBS} - Statically Linked Tools: ${support_static_tools} - Statically Linked FD: ${support_static_fd} - Statically Linked SD: ${support_static_sd} - Statically Linked DIR: ${support_static_dir} - Statically Linked CONS: ${support_static_cons} - Database type: ${db_type} - Database port: ${db_port} - Database lib: ${DB_LIBS} - Database name: ${db_name} - Database user: ${db_user} - - Job Output Email: ${job_email} - Traceback Email: ${dump_email} - SMTP Host Address: ${smtp_host} - - Director Port: ${dir_port} - File daemon Port: ${fd_port} - Storage daemon Port: ${sd_port} - - Director User: ${dir_user} - Director Group: ${dir_group} - Storage Daemon User: ${sd_user} - Storage DaemonGroup: ${sd_group} - File Daemon User: ${fd_user} - File Daemon Group: ${fd_group} - - SQL binaries Directory ${SQL_BINDIR} + Host: ${host}${post_host} -- ${DISTNAME} ${DISTVER} + Bacula version: ${BACULA} ${VERSION} (${DATE}) + Source code location: ${srcdir} + Install binaries: ${sbindir} + Install libraries: ${libdir} + Install config files: ${sysconfdir} + Scripts directory: ${scriptdir} + Archive directory: ${archivedir} + Working directory: ${working_dir} + PID directory: ${piddir} + Subsys directory: ${subsysdir} + Man directory: ${mandir} + Data directory: ${datarootdir} + Plugin directory: ${plugindir} + C Compiler: ${CC} ${CCVERSION} + C++ Compiler: ${CXX} ${CXXVERSION} + Compiler flags: ${WCFLAGS} ${CFLAGS} + Linker flags: ${WLDFLAGS} ${LDFLAGS} + Libraries: ${LIBS} + Statically Linked Tools: ${support_static_tools} + Statically Linked FD: ${support_static_fd} + Statically Linked SD: ${support_static_sd} + Statically Linked DIR: ${support_static_dir} + Statically Linked CONS: ${support_static_cons} + Database backends: ${db_backends} + Database port: ${db_port} + Database name: ${db_name} + Database user: ${db_user} + + Job Output Email: ${job_email} + Traceback Email: ${dump_email} + SMTP Host Address: ${smtp_host} + + Director Port: ${dir_port} + File daemon Port: ${fd_port} + Storage daemon Port: ${sd_port} + + Director User: ${dir_user} + Director Group: ${dir_group} + Storage Daemon User: ${sd_user} + Storage DaemonGroup: ${sd_group} + File Daemon User: ${fd_user} + File Daemon Group: ${fd_group} Large file support: $largefile_support Bacula conio support: ${got_conio} ${CONS_LIBS} @@ -32170,7 +32687,7 @@ Configuration on `date`: build-dird: ${build_dird} build-stored: ${build_stored} Plugin support: ${have_plugins} - AFS support: ${have_afs} + AFS support: ${have_afs} ACL support: ${have_acl} XATTR support: ${have_xattr} Python support: ${support_python} ${PYTHON_LIBS} @@ -32190,13 +32707,3 @@ echo __EOC__ >> scripts/bacula_config chmod 755 scripts/bacula_config cat config.out - -# Display a warning message if postgresql client lib is <= 8.1 -if test x$DB_TYPE = xpostgresql -a 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