ebl Remove db berkeley from configure process

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

diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in
index 6f9e2f7fa8d3d5662b91ec0632f3fda1f18ce922..05f8555f46d8542e841bfaf678bbc74fd6c05bdc 100644 (file)
--- a/bacula/autoconf/config.h.in
+++ b/bacula/autoconf/config.h.in
@@ -39,9 +39,6 @@
 /* Define if you want to use SQLite3 */
 #undef HAVE_SQLITE3
 
-/* Define if you want to use Berkeley DB */
-#undef HAVE_BERKELEY_DB
-
 /* Define if you want to use mSQL */
 #undef HAVE_MSQL
 
@@ -870,9 +867,6 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Set if DB Berkeley is used for accurate backup */
-#undef USE_DB
-
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
 

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 20a91da9725f6ed056ae9c359353a7814c324566..0fef2e22110f220ab332ce45aba9ee3d372df7fb 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -197,7 +197,6 @@ support_bat=no
 support_wx_console=no
 support_tls=no
 support_crypto=no
-support_libdb=yes
 gnome_version=
 wx_version=
 support_static_tools=no
@@ -217,29 +216,6 @@ dnl# --------------------------------------------------------------------------
 dnl# CHECKING COMMAND LINE OPTIONS
 dnl# --------------------------------------------------------------------------
 
-# -------------------------------------------
-# Berkeley DB (default off)
-# -------------------------------------------
-
-AC_ARG_ENABLE(libdb,
-  [  --disable-libdb     disable build of accurate mode with libdb],
-  [if test x$enableval = xno; then
-    support_libdb=no
-  fi])
-
-if test x$support_libdb = xyes; then
- support_libdb=no
- AX_PATH_BDB([3],[
-   support_libdb=yes
- ])
-fi
-
-if test x$support_libdb = xyes; then
-   AC_DEFINE(USE_DB, 1, [Set if DB Berkeley is used for accurate backup])
-   AC_SUBST(BDB_CPPFLAGS)
-   AC_SUBST(BDB_LIBS)
-fi
-
 # -------------------------------------------
 # gnome (default off)
 # -------------------------------------------
@@ -2618,7 +2594,6 @@ Configuration on `date`:
   ACL support:               ${have_acl}
   Python support:            ${support_python} ${PYTHON_LIBS}
   Batch insert enabled:       ${support_batch_insert}
-  Berkeley DB support:       ${support_libdb} ${BDB_LIBS}
 
   " > config.out
 

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index ffd2e840deffaa08a66b32fd89429389938ac0fd..5f461c97bc31ed2a206659c459af428168709cb5 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -18,6 +18,7 @@ remove reader/writer in FOPTS????
 
 General:
 05Oct08
+ebl  Remove db berkeley from configure process
 kes  Do dirty check on hostname (Linux only) and if not resolvable
      use localhost as default.
 kes  Increase vtape max block to 20GB.