Changeset 288

Timestamp:

28/12/2005 11:38:04 (6 years ago)

Author:

martin

Message:

Now supports Berkeley DB versions >= 4.1 in addition to 1.x. The versions inbetween are not supported because they require code changes and I don't have them available to test against.

Location:

box/trunk

Files:

• bin/bbackupd/BackupClientInodeToIDMap.cpp (modified) (7 diffs)
• configure.ac (modified) (3 diffs)
• infrastructure/m4/ax_compare_version.m4 (added)
• infrastructure/m4/ax_path_bdb.m4 (added)
• infrastructure/m4/ax_split_version.m4 (added)

box/trunk/bin/bbackupd/BackupClientInodeToIDMap.cpp

@@ -15 +15 @@
         #include <fcntl.h>
         #include <limits.h>
-        #include DB_HEADER
+        #include <db.h>
         #include <sys/stat.h>
 #endif
@@ -66 +66 @@
         if(dbp != 0)
         {
-#ifdef BERKELY_V4
+#if BDB_VERSION_MAJOR >= 3
                 dbp->close(0);
 #else
@@ -95 +95 @@
         
         // Open the database file
-#ifdef BERKELY_V4
+#if BDB_VERSION_MAJOR >= 3
         dbp = new Db(0,0);
         dbp->set_pagesize(1024);                /* Page size: 1K. */
@@ -147 +147 @@
         if(dbp != 0)
         {
-#ifdef BERKELY_V4
+#if BDB_VERSION_MAJOR >= 3
                 if(dbp->close(0) != 0)
 #else
@@ -189 +189 @@
         rec.mInDirectory = InDirectory;
 
-#ifdef BERKELY_V4
+#if BDB_VERSION_MAJOR >= 3
         Dbt key(&InodeRef, sizeof(InodeRef));
         Dbt data(&rec, sizeof(rec));
@@ -251 +251 @@
         }
 
-#ifdef BERKELY_V4
+#if BDB_VERSION_MAJOR >= 3
         Dbt key(&InodeRef, sizeof(InodeRef));
         Dbt data(0, 0);
@@ -281 +281 @@
 
         // Check for sensible return
-#ifdef BERKELY_V4
+#if BDB_VERSION_MAJOR >= 3
         if(key.get_data() == 0 || data.get_size() != sizeof(IDBRecord))
         {

box/trunk/configure.ac

@@ -33 +33 @@
 if test "$target_os" != "mingw32" -a "$target_os" != "winnt"; then
   AC_SEARCH_LIBS([nanosleep], [rt], [ac_have_nanosleep=yes],
-                 [AC_MSG_ERROR([[Cannot find a short sleep function (nanosleep)]])])
-fi
-AC_CHECK_LIB([z], [zlibVersion],, [AC_MSG_ERROR([[Cannot find zlib]])])
-AX_CHECK_BDB_V1
+                 [AC_MSG_ERROR([[cannot find a short sleep function (nanosleep)]])])
+fi
+AC_CHECK_LIB([z], [zlibVersion],, [AC_MSG_ERROR([[cannot find zlib]])])
 VL_LIB_READLINE
 have_libreadline=no
 test "x$vl_cv_lib_readline" != "xno" && have_libreadline=yes
 
+## Check for Berkely DB. Restrict to certain versions
+AX_PATH_BDB(, [
+  LIBS="$BDB_LIBS $LIBS"
+  LDFLAGS="$BDB_LDFLAGS $LDFLAGS"
+  CPPFLAGS="$CPPFLAGS $BDB_CPPFLAGS"
+
+  AX_COMPARE_VERSION([$BDB_VERSION],[ge],[4.1],,
+    [AX_COMPARE_VERSION([$BDB_VERSION],[lt],[2],,
+      [AC_MSG_ERROR([[only Berkely DB versions 1.x or at least 4.1 are currently supported]])]
+      )]
+  )
+  AX_SPLIT_VERSION([BDB_VERSION], [$BDB_VERSION])
+])
 
 ## Check for Open SSL, use old versions only if explicitly requested
@@ -179 +191 @@
 
 Large files:         $have_large_file_support
-Berkeley DB:         $ac_have_bdb
+Berkeley DB:         $ax_path_bdb_ok
 Readline:            $have_libreadline
 Extended attributes: $ac_cv_header_sys_xattr_h
@@ -205 +217 @@
     ;;
 esac
-
-if test "x$ac_have_bdb" != "xyes"; then
-  echo
-  AC_MSG_WARN([[db is not installed -- will run in reduced efficiency mode without it]])
-fi