]
)
- LIBS="${saved_LIBS}"
- CFLAGS="${saved_CFLAGS}"
-
if test "$support_tls" = "yes"; then
AC_DEFINE(HAVE_OPENSSL, 1, [Define if OpenSSL library is available])
AC_DEFINE(HAVE_TLS, 1, [Define if TLS support should be enabled])
if test "$ac_cv_openssl_export" = "yes"; then
AC_DEFINE(HAVE_OPENSSL_EXPORT_LIBRARY, 1, [Define if the OpenSSL library is export-contrained to 128bit ciphers])
fi
+
+ if test "$support_crypto" = "yes"; then
+ AC_CHECK_LIB(ssl, EVP_PKEY_encrypt_old, AC_DEFINE(HAVE_OPENSSLv1, 1, [Set if have OpenSSL version 1.x]))
+ fi
+
+ LIBS="${saved_LIBS}"
+ CFLAGS="${saved_CFLAGS}"
else
support_tls="no"
support_crypto="no"
if test "$support_crypto" = "no"; then
OPENSSL_LIBS=""
OPENSSL_INC=""
-else
- AC_CHECK_LIB(ssl, EVP_PKEY_encrypt_old, AC_DEFINE(HAVE_OPENSSLv1, 1, [Set if have OpenSSL version 1.x]))
fi
AC_SUBST(OPENSSL_LIBS)
]
)
fi
+
+dnl For postgresql checking
+saved_LIBS="${LIBS}"
+LIBS="${saved_LIBS} ${SQL_LFLAGS}"
-dnl Check if postgresql can support batch mode
+dnl Check if postgresql can support batch mode
if test x$DB_TYPE = xpostgresql; then
+ support_batch_insert=yes
AC_CHECK_LIB(pq, PQisthreadsafe, AC_DEFINE(HAVE_PQISTHREADSAFE, 1, [Set if have PQisthreadsafe]))
AC_CHECK_LIB(pq, PQputCopyData, AC_DEFINE(HAVE_PQ_COPY, 1, [Set if have PQputCopyData]))
- if test "x$ac_cv_lib_pq_PQputCopyData" != "xyes"
- then
- support_batch_insert=no
+ test "x$ac_cv_lib_pq_PQputCopyData" = "xyes"
+ pkg=$?
+ if test $pkg = 0; then
+ AC_ARG_ENABLE(batch-insert,
+ AC_HELP_STRING([--enable-batch-insert], [enable the DB batch insert code @<:@default=no@:>@]),
+ [
+ if test x$enableval = xno; then
+ support_batch_insert=no
+ fi
+ ]
+ )
+ else
+ support_batch_insert=no
fi
fi
if test $DB_PROG = postgresql; then
AC_CHECK_LIB(pq, PQisthreadsafe, AC_DEFINE(HAVE_PQISTHREADSAFE))
AC_CHECK_LIB(pq, PQputCopyData, AC_DEFINE(HAVE_PQ_COPY))
- test "x$ac_cv_lib_pq_PQputCopyData" != "xyes"
+ test "x$ac_cv_lib_pq_PQputCopyData" = "xyes"
pkg=$?
fi
uncomment_dbi="#"
fi
+dnl revert after postgresql checks
+LIBS="${saved_LIBS}"
+
AC_SUBST(uncomment_dbi)
dnl For Ingres always enable batch inserts.
AC_C_CONST
+AC_C_BIGENDIAN([AC_DEFINE([HAVE_BIG_ENDIAN], [1], [Big Endian])], [AC_DEFINE([HAVE_LITTLE_ENDIAN], [1], [Little Endian])])
+
dnl --------------------------------------------------------------------------
dnl CHECKING FOR FILESYSTEM TYPE
dnl --------------------------------------------------------------------------
have_extended_acl=no
if test x$support_acl = xyes -o x$support_acl = xauto; then
AC_CHECK_HEADER(sys/acl.h, [ AC_DEFINE(HAVE_SYS_ACL_H,1,[Defines if your system have the sys/acl.h header file])] , )
+
+ dnl
+ dnl First check for acl_get_file in libc
+ dnl
AC_CHECK_FUNC(acl_get_file,
[
have_acl=yes
- ], [
- AC_CHECK_LIB(acl, acl_get_file,
- [
- have_acl=yes;
- if test $have_afs = yes; then
- dnl
- dnl Because of possible naming conflict with AFS libacl make sure we use the one in /usr/lib64 or /usr/lib !!!
- dnl
- 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
- ], [
- AC_CHECK_LIB(pacl, acl_get_file,
- [
- have_acl=yes;
- FDLIBS="-lpacl $FDLIBS"
- ], [
- AC_CHECK_LIB(sec, acltotext,
- [
- have_acl=yes;
- FDLIBS="-lsec $FDLIBS"
-
- AC_CHECK_LIB(sec, acl_totext,
- [
- have_extended_acl=yes
- ]
- )
- ]
- )
- ]
- )
- ]
- )
]
)
+ dnl
+ dnl Check for acl_get_file in libacl (Linux)
+ dnl
+ if test $have_acl = no; then
+ AC_CHECK_LIB(acl, acl_get_file,
+ [
+ have_acl=yes
+ if test $have_afs = yes; then
+ dnl
+ dnl Because of possible naming conflict with AFS libacl make sure we use the one in /usr/lib64 or /usr/lib !!!
+ dnl
+ 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
+ ]
+ )
+ fi
+
+ dnl
+ dnl Check for acl_get_file in libpacl (OSF1)
+ dnl
+ if test $have_acl = no; then
+ AC_CHECK_LIB(pacl, acl_get_file,
+ [
+ have_acl=yes
+ FDLIBS="-lpacl $FDLIBS"
+ ]
+ )
+ fi
+
+ dnl
+ dnl Check for acltotext and acl_totext (Solaris)
+ dnl
+ if test $have_acl = no; then
+ AC_CHECK_LIB(sec, acltotext,
+ [
+ have_acl=yes
+ FDLIBS="-lsec $FDLIBS"
+
+ AC_CHECK_LIB(sec, acl_totext,
+ [
+ have_extended_acl=yes
+ ]
+ )
+ ]
+ )
+ fi
+
+ dnl
+ dnl Check for acl_get and aclx_get (AIX)
+ dnl
+ if test $have_acl = no; then
+ AC_CHECK_FUNC(acl_get,
+ [
+ have_acl=yes
+
+ AC_CHECK_FUNC(aclx_get,
+ [
+ have_extended_acl=yes
+ ]
+ )
+ ]
+ )
+ fi
+
if test x$support_acl = xyes -a $have_acl != yes; then
AC_MSG_ERROR([acl support explicitly enabled but no supported acl implementation found,
please either load the acl libraries or rerun configure without --enable-acl])
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