From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 25 Jun 2007 16:30:49 +0000 (+0000)
Subject: kes  Fix HAVE_BATCH_INSERT to be HAVE_BATCH_FILE_INSERT, pointed
X-Git-Tag: Release-7.0.0~6077
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=06fdba21b6bd37ca4d6d06c187d5df1cbdc906a1;p=bacula%2Fbacula

kes  Fix HAVE_BATCH_INSERT to be HAVE_BATCH_FILE_INSERT, pointed
     out by Eric (my typo).

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5088 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/autoconf/config.h.in.save b/bacula/autoconf/config.h.in.save
index 5310b7d753..354c481436 100644
--- a/bacula/autoconf/config.h.in.save
+++ b/bacula/autoconf/config.h.in.save
@@ -276,6 +276,12 @@
 /* Define to 1 if you have the <assert.h> header file. */
 #undef HAVE_ASSERT_H
 
+/* Set if Bacula bat Qt4 GUI support enabled */
+#undef HAVE_BAT
+
+/* Set if DB batch insert code enabled */
+#undef HAVE_BATCH_FILE_INSERT
+
 /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
    CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT
@@ -337,6 +343,9 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
+/* Define to 1 if you have the `fdatasync' function. */
+#undef HAVE_FDATASYNC
+
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
@@ -497,6 +506,12 @@
 /* Define if OpenSSL library is available */
 #undef HAVE_OPENSSL
 
+/* Define if the OpenSSL library is export-contrained to 128bit ciphers */
+#undef HAVE_OPENSSL_EXPORT_LIBRARY
+
+/* Define to 1 if you have the `posix_fadvise' function. */
+#undef HAVE_POSIX_FADVISE
+
 /* Define if your printf() function supports format strings with positions. */
 #undef HAVE_POSIX_PRINTF
 
diff --git a/bacula/configure b/bacula/configure
index db661d36a4..c3a1909f6e 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -19513,18 +19513,19 @@ if test "${enable_batch_insert+set}" = set; then
   enableval=$enable_batch_insert; if test x$enableval = xno; then
        support_batch_insert=no
       else
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BATCH_INSERT 1
-_ACEOF
-
        support_batch_insert=yes
      fi
 fi
 
 fi
 
+if test $support_batch_insert = yes ; then
 
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_BATCH_FILE_INSERT 1
+_ACEOF
+
+fi
 
 
 cat >>confdefs.h <<\_ACEOF
diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 2fc45734f9..2c40f03285 100644
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -4,6 +4,8 @@ General:
 
 Release 2.1.22 beta
 25Jun07
+kes  Fix HAVE_BATCH_INSERT to be HAVE_BATCH_FILE_INSERT, pointed
+     out by Eric (my typo).
 ebl  Fix configure.in to get batch mode enable
 kes  Return correct string from authenticate.cpp in bat when connecting
      to Dir.