Backport from Bacula Enterprise

[bacula/bacula] / bacula / autoconf / acconfig.h

diff --git a/bacula/autoconf/acconfig.h b/bacula/autoconf/acconfig.h
index e9cef42055dd2798dbf4493faded6c55962d72db..3a694a0fce1933791d0e74dbc751b26e612e0cc4 100644 (file)
--- a/bacula/autoconf/acconfig.h
+++ b/bacula/autoconf/acconfig.h
@@ -1,6 +1,11 @@
 /* ------------------------------------------------------------------------- */
 /* --                     CONFIGURE SPECIFIED FEATURES                    -- */
 /* ------------------------------------------------------------------------- */
+
+/*
+ * Copyright (C) 2000-2015 Kern Sibbald
+ * License: BSD 2-Clause; see file LICENSE-FOSS
+ */
    
 /* Define if you want to use MySQL as Catalog database */
 #undef USE_MYSQL_DB
@@ -20,52 +25,17 @@
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef ssize_t
 
+/* Define if you want to use PostgreSQL */
+#undef HAVE_POSTGRESQL
+
 /* Define if you want to use MySQL */
 #undef HAVE_MYSQL
 
-/* Defined if MySQL thread safe library is present */
-#undef HAVE_THREAD_SAFE_MYSQL
-
 /* Define if you want to use embedded MySQL */
 #undef HAVE_EMBEDDED_MYSQL
 
-/* Define if you want to use SQLite */
-#undef HAVE_SQLITE
-
-/* Define if you want to use Berkeley DB */
-#undef HAVE_BERKELEY_DB
-
-
-/* Define if you want to use PostgreSQL */
-#undef HAVE_PGSQL
-
-/* Define if you want to use mSQL */
-#undef HAVE_MSQL
-
-/* Define if you want to use iODBC */
-#undef HAVE_IODBC
-
-/* Define if you want to use unixODBC */
-#undef HAVE_UNIXODBC
-
-/* Define if you want to use Solid SQL Server */
-#undef HAVE_SOLID
-
-/* Define if you want to use OpenLink ODBC (Virtuoso) */
-#undef HAVE_VIRT
-
-/* Define if you want to use EasySoft ODBC */
-#undef HAVE_EASYSOFT
-
-/* Define if you want to use Interbase SQL Server */
-#undef HAVE_IBASE
-
-/* Define if you want to use Oracle 8 SQL Server */
-#undef HAVE_ORACLE8
-
-/* Define if you want to use Oracle 7 SQL Server */
-#undef HAVE_ORACLE7
-
+/* Define if you want to use SQLite3 */
+#undef HAVE_SQLITE3
 
 /* ------------------------------------------------------------------------- */
 /* --                     CONFIGURE DETECTED FEATURES                     -- */
@@ -84,9 +54,6 @@
 /* Define if you have GCC */
 #undef HAVE_GCC
 
-/* Define if you have the Andrew File System.  */
-#undef AFS
-
 /* Define If you want find -nouser and -nogroup to make tables of
    used UIDs and GIDs at startup instead of using getpwuid or
    getgrgid when needed.  Speeds up -nouser and -nogroup unless you
@@ -121,10 +88,6 @@
 /* Define to 1 if utime.h exists and declares struct utimbuf.  */
 #undef HAVE_UTIME_H
 
-#if (HAVE_MYSQL||HAVE_PGSQL||HAVE_MSQL||HAVE_IODBC||HAVE_UNIXODBC||HAVE_SOLID||HAVE_VIRT||HAVE_IBASE||HAVE_ORACLE8||HAVE_ORACLE7||HAVE_EASYSOFT)
-#define HAVE_SQL
-#endif
-
 /* Data types */
 #undef HAVE_U_INT
 #undef HAVE_INTXX_T
@@ -144,9 +107,18 @@
 /* Directory for PID files */
 #undef _PATH_BACULA_PIDDIR
 
+/* LOCALEDIR */
+#undef LOCALEDIR
+
 /* Define if you have zlib */
 #undef HAVE_LIBZ
 
+/* Define if you have lzo lib */
+#undef HAVE_LZO
+
+/* Define if you have libacl */
+#undef HAVE_ACL
+
 /* General libs */
 #undef LIBS
 
@@ -176,6 +148,7 @@
 #undef HAVE_CYGWIN
 #undef HAVE_OSF1_OS
 #undef HAVE_DARWIN_OS
+#undef HAVE_HURD_OS
 
 /* Set to correct scanf value for long long int */
 #undef lld
@@ -205,5 +178,28 @@
 #undef HAVE_SOCKLEN_T
 
 #undef HAVE_OLD_SOCKOPT
+#undef USE_THR_SETCONCURRENCY
  
-#undef HAVE_BIGENDIAN
+/* Defined if Gtk+-2.4 or greater is present */
+#undef HAVE_GTK_2_4
+
+/* Needed on HP-UX/g++ systems to support long long ints (int64) */
+#undef _INCLUDE_LONGLONG
+
+/* Define to system config directory */
+#undef SYSCONFDIR
+
+/* Define if OPENSSL is available */
+#undef HAVE_OPENSSL
+
+/* Define if comm encryption should be enabled */
+#undef HAVE_TLS
+
+/* Define if data encryption should be enabled */
+#undef HAVE_CRYPTO
+
+/* Define the LOCALEDIR if a translation */
+#undef LOCALEDIR
+
+/* Define if language support is enabled */
+#undef ENABLE_NLS