Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1382174 - /apr/apr/trunk/build/dbm.m4
Date: Fri, 07 Sep 2012 21:14:19 -0000
To: commits@apr.apache.org
From: sf@apache.org
Message-Id: <20120907211419.A9C2023888EA@eris.apache.org>

Author: sf
Date: Fri Sep  7 21:14:19 2012
New Revision: 1382174

URL: http://svn.apache.org/viewvc?rev=1382174&view=rev
Log:
Check all DB minor versions if --with-dbm=db5 or --with-dbm=db4 is given

Modified:
    apr/apr/trunk/build/dbm.m4

Modified: apr/apr/trunk/build/dbm.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/dbm.m4?rev=1382174&r1=1382173&r2=1382174&view=diff
==============================================================================
--- apr/apr/trunk/build/dbm.m4 (original)
+++ apr/apr/trunk/build/dbm.m4 Fri Sep  7 21:14:19 2012
@@ -424,7 +424,7 @@ AC_DEFUN([APU_CHECK_DB], [
       AC_MSG_ERROR(Berkeley db3 not found)
     fi
     ;;
-  db[[45]] | db[[45]][[0-9]])
+  db[[45]][[0-9]])
     db_major=`echo "$requested" | sed -e 's/db//' -e 's/.$//'`
     db_minor=`echo "$requested" | sed -e 's/db//' -e 's/.//'`
     APU_CHECK_DBXY("$check_places", "$db_major", "$db_minor")
@@ -432,6 +432,22 @@ AC_DEFUN([APU_CHECK_DB], [
       AC_MSG_ERROR(Berkeley db$db_major not found)
     fi
     ;;
+  db[[45]])
+    db_major=`echo "$requested" | sed -e 's/db//'`
+    # Start version search at version x.9
+    db_minor=9
+    while [[ $db_minor -ge 0 ]]
+    do
+      APU_CHECK_DBXY("$check_places", "$db_major", "$db_minor")
+      if test "$apu_have_db" = "1"; then
+        break
+      fi
+      db_minor=`expr $db_minor - 1`
+    done
+    if test "$apu_db_version" != "$db_major"; then
+      AC_MSG_ERROR(Berkeley db$db_major not found)
+    fi
+    ;;
   default)
     APU_CHECK_DB_ALL("$check_places")
     ;;