diff options
author | rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68> | 2013-11-23 17:57:39 +0000 |
---|---|---|
committer | rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68> | 2013-11-23 17:57:39 +0000 |
commit | 6997e008e335701c49aca3d4558ba6210327377b (patch) | |
tree | 3e9adb2659fae957f2a181c02696639870003686 /build/dbm.m4 | |
parent | 6244e2a4879428833bc61acc0904ce583c9b5cd3 (diff) | |
download | libapr-6997e008e335701c49aca3d4558ba6210327377b.tar.gz |
Fix detection of Berkeley DB 6.
PR 55277
Patch by Lars Wendler <polynomial-c gentoo.org>
(slightly modified)
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1544846 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/dbm.m4')
-rw-r--r-- | build/dbm.m4 | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/build/dbm.m4 b/build/dbm.m4 index 8312e0edf..bbe9c863a 100644 --- a/build/dbm.m4 +++ b/build/dbm.m4 @@ -112,7 +112,7 @@ AC_DEFUN([APU_CHECK_BERKELEY_DB], [ changequote([,]) unset $cache_id AC_CHECK_HEADER([$bdb_header], [ - if test "$1" = "3" -o "$1" = "4" -o "$1" = "5"; then + if test "$1" = "3" -o "$1" = "4" -o "$1" = "5" -o "$1" = "6"; then # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of @@ -455,13 +455,13 @@ AC_DEFUN([APU_CHECK_DB], [ ]) dnl -dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.X to 1. +dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 6.X to 1. dnl AC_DEFUN([APU_CHECK_DB_ALL], [ all_places=$1 - # Start version search at version 5.9 - db_version=59 + # Start version search at version 6.9 + db_version=69 while [[ $db_version -ge 40 ]] do db_major=`echo $db_version | sed -e 's/.$//'` @@ -511,19 +511,34 @@ AC_DEFUN([APU_CHECK_DBM], [ apu_db_version=0 # Maximum supported version announced in help string. - # Although we search for all versions up to 5.9, + # Although we search for all versions up to 6.9, # we should only include existing versions in our # help string. - db_max_version=53 - db_min_version=41 dbm_list="sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4" + db_max_version=48 + db_min_version=41 + db_version="$db_min_version" + while [[ $db_version -le $db_max_version ]] + do + dbm_list="$dbm_list, db$db_version" + db_version=`expr $db_version + 1` + done + db_max_version=53 + db_min_version=50 + db_version="$db_min_version" + while [[ $db_version -le $db_max_version ]] + do + dbm_list="$dbm_list, db$db_version" + db_version=`expr $db_version + 1` + done + db_max_version=60 + db_min_version=60 db_version="$db_min_version" while [[ $db_version -le $db_max_version ]] do dbm_list="$dbm_list, db$db_version" db_version=`expr $db_version + 1` done - dbm_list="$dbm_list, db60" AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X} for some X=0,...,9])], |