[Hotkeys-commits] r253 - trunk

[formorer at alioth.debian.org]

Author: formorer
Date: 2007-08-03 19:22:42 +0000 (Fri, 03 Aug 2007)
New Revision: 253

Modified:
   trunk/acinclude.m4
   trunk/configure.in
Log:
Update to bdb4 


Modified: trunk/acinclude.m4
===================================================================
--- trunk/acinclude.m4	2005-10-01 20:54:44 UTC (rev 252)
+++ trunk/acinclude.m4	2007-08-03 19:22:42 UTC (rev 253)
@@ -337,21 +337,21 @@
 
 
 dnl-----------------------------------------------------------------------
-dnl Checks for LIBDB3
+dnl Checks for LIBDB
 dnl-----------------------------------------------------------------------
-AC_DEFUN(AM_CHECK_DB3,
+AC_DEFUN(AM_CHECK_DB,
 [
-    if test ! x$db3_libdir = x; then
-        LIBS="$LIBS -L$db3_libdir"
+    if test ! x$db_libdir = x; then
+        LIBS="$LIBS -L$db_libdir"
     fi
-    if test ! x$db3_incdir = x; then
-        CPPFLAGS="$CPPFLAGS -I$db3_incdir"
+    if test ! x$db_incdir = x; then
+        CPPFLAGS="$CPPFLAGS -I$db_incdir"
     fi
 
     dnl
-    dnl We need to check both libdb and libdb3
+    dnl We need to check both libdb and libdb
     dnl
-    AC_CHECK_LIB(db3, db_create, , [ nodb=yes ])
+    AC_CHECK_LIB(db, db_create, , [ nodb=yes ])
     if test "x$nodb" = "xyes"
     then
         AC_CHECK_LIB(db, db_create, ,
@@ -359,7 +359,7 @@
             echo "*** Cannot find a suitable Berkeley DB library on your system."
             echo "*** Version 3.2.9 or above is required."
             echo "*** If you've installed it in an unusual location, please"
-            echo "*** use --with-db3-inc and --with-db3-lib to specify it."
+            echo "*** use --with-db-inc and --with-db-lib to specify it."
             exit 1
           ])
     fi
@@ -367,14 +367,14 @@
     dnl
     dnl Check its version
     dnl
-    AC_MSG_CHECKING(for version of db3)
+    AC_MSG_CHECKING(for version of db)
     AC_TRY_RUN([
     #include <db.h>
     int main ()
     {
         int major=0, minor=0, patch=0;
         db_version(&major, &minor, &patch);
-        if ( major==3 && ((minor==2 && patch>=9) || minor>2) )
+        if ( major > 3 || (major==3 && ((minor==2 && patch>=9) || minor>2)) )
             exit(0);
         else
             exit(1);
@@ -384,7 +384,7 @@
         echo "*** The version of the Berkeley DB library installed is not"
         echo "*** 3.2.9 or above, make sure the correct version is installed."
         echo "*** If you've installed it in an unusual location, please"
-        echo "*** use --with-db3-inc and --with-db3-lib to specify it."
+        echo "*** use --with-db-inc and --with-db-lib to specify it."
         exit 1
       ],
       [echo $ac_n "cross compiling; assumed OK... $ac_c"]

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-10-01 20:54:44 UTC (rev 252)
+++ trunk/configure.in	2007-08-03 19:22:42 UTC (rev 253)
@@ -22,20 +22,20 @@
                              [Do not try to compile and run a test XML program]),
               , enable_xmltest=yes)
 
-AC_ARG_WITH(db3-inc,
-            AC_HELP_STRING([--with-db3-inc=DIR],
-                           [Set the include directory of Berkeley DB3]),
-            db3_incdir="$withval", db3_incdir="")
+AC_ARG_WITH(db-inc,
+            AC_HELP_STRING([--with-db-inc=DIR],
+                           [Set the include directory of Berkeley DB]),
+            db_incdir="$withval", db_incdir="")
  
-AC_ARG_WITH(db3-lib,
-            AC_HELP_STRING([--with-db3-lib=DIR],
-                           [Set the library directory of Berkeley DB3]),
-            db3_libdir="$withval", db3_libdir="")
+AC_ARG_WITH(db-lib,
+            AC_HELP_STRING([--with-db-lib=DIR],
+                           [Set the library directory of Berkeley DB]),
+            db_libdir="$withval", db_libdir="")
 
-AC_ARG_ENABLE(db3test,
-              AC_HELP_STRING([--disable-db3test],
-                             [Do not try to test for libdb3, assume it's present]),
-              , enable_db3test=yes)
+AC_ARG_ENABLE(dbtest,
+              AC_HELP_STRING([--disable-dbtest],
+                             [Do not try to test for libdb, assume it's present]),
+              , enable_dbtest=yes)
 
 AC_ARG_WITH(gtk,
             AC_HELP_STRING([--with-gtk],
@@ -96,12 +96,12 @@
 dnl AC_SUBST(GLIB_CFLAGS)
 
 dnl-----------------------------------------------------------------------
-dnl Checks for DB3
+dnl Checks for DB
 dnl-----------------------------------------------------------------------
-if test "x$enable_db3test" = "xyes"; then
-    AM_CHECK_DB3
+if test "x$enable_dbtest" = "xyes"; then
+    AM_CHECK_DB
 else
-#    AC_MSG_NOTICE([Skipping libdb3 test])
+#    AC_MSG_NOTICE([Skipping libdb test])
 echo
 fi