subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1044170 - /subversion/trunk/build/ac-macros/berkeley-db.m4
Date Thu, 09 Dec 2010 23:46:40 GMT
Author: hwright
Date: Thu Dec  9 23:46:40 2010
New Revision: 1044170

URL: http://svn.apache.org/viewvc?rev=1044170&view=rev
Log:
Support Berkeley DB 5.  This addresses issue #3760.

Patch by: Bernhard Rosenkraenzer <bero@tigris.org>

* build/ac-macros/berkeley-db.m4
  (SVN_LIB_BERKELEY_DB): Support Berkeley DB 5.

Modified:
    subversion/trunk/build/ac-macros/berkeley-db.m4

Modified: subversion/trunk/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/berkeley-db.m4?rev=1044170&r1=1044169&r2=1044170&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/trunk/build/ac-macros/berkeley-db.m4 Thu Dec  9 23:46:40 2010
@@ -64,7 +64,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
       fi
 
       if test "$withval" = "yes"; then
-        if test "$apu_db_version" != "4"; then
+        if test "$apu_db_version" -lt "4"; then
           AC_MSG_ERROR([APR-UTIL wasn't linked against Berkeley DB 4,
                         while the fs component is required.  Reinstall
                         APR-UTIL with the appropiate options.])
@@ -73,7 +73,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
         status=required
 
       elif test "$apu_found" != "reconfig"; then
-        if test "$apu_db_version" != 4; then
+        if test "$apu_db_version" -lt 4; then
           AC_MSG_ERROR([APR-UTIL was installed independently, it won't be
                         possible to use the specified Berkeley DB: $withval])
         fi
@@ -115,7 +115,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
                    whether apr-util is linked against Berkeley DB
                    $db_version])
       status=try-link
-    elif test "$apu_db_version" != "4"; then
+    elif test "$apu_db_version" -lt "4"; then
       status=skip
     else
       status=try-link



Mime
View raw message