|
Line
Link Here
|
| 0 |
-- apr-util-1.5.2/build/dbm.m4 |
0 |
++ apr-util-1.5.2/build/dbm.m4 |
|
Lines 112-118
Link Here
|
| 112 |
changequote([,]) |
112 |
changequote([,]) |
| 113 |
unset $cache_id |
113 |
unset $cache_id |
| 114 |
AC_CHECK_HEADER([$bdb_header], [ |
114 |
AC_CHECK_HEADER([$bdb_header], [ |
| 115 |
if test "$1" = "3" -o "$1" = "4" -o "$1" = "5"; then |
115 |
if test "$1" = "3" -o "$1" = "4" -o "$1" = "5" -o "$1" = "6"; then |
| 116 |
# We generate a separate cache variable for each prefix and libname |
116 |
# We generate a separate cache variable for each prefix and libname |
| 117 |
# we search under. That way, we avoid caching information that |
117 |
# we search under. That way, we avoid caching information that |
| 118 |
# changes if the user runs `configure' with a different set of |
118 |
# changes if the user runs `configure' with a different set of |
|
Lines 424-430
Link Here
|
| 424 |
AC_MSG_ERROR(Berkeley db3 not found) |
424 |
AC_MSG_ERROR(Berkeley db3 not found) |
| 425 |
fi |
425 |
fi |
| 426 |
;; |
426 |
;; |
| 427 |
db[[45]][[0-9]]) |
427 |
db[[456]][[0-9]]) |
| 428 |
db_major=`echo "$requested" | sed -e 's/db//' -e 's/.$//'` |
428 |
db_major=`echo "$requested" | sed -e 's/db//' -e 's/.$//'` |
| 429 |
db_minor=`echo "$requested" | sed -e 's/db//' -e 's/.//'` |
429 |
db_minor=`echo "$requested" | sed -e 's/db//' -e 's/.//'` |
| 430 |
APU_CHECK_DBXY("$check_places", "$db_major", "$db_minor") |
430 |
APU_CHECK_DBXY("$check_places", "$db_major", "$db_minor") |
|
Lines 432-438
Link Here
|
| 432 |
AC_MSG_ERROR(Berkeley db$db_major not found) |
432 |
AC_MSG_ERROR(Berkeley db$db_major not found) |
| 433 |
fi |
433 |
fi |
| 434 |
;; |
434 |
;; |
| 435 |
db[[45]]) |
435 |
db[[456]]) |
| 436 |
db_major=`echo "$requested" | sed -e 's/db//'` |
436 |
db_major=`echo "$requested" | sed -e 's/db//'` |
| 437 |
# Start version search at version x.9 |
437 |
# Start version search at version x.9 |
| 438 |
db_minor=9 |
438 |
db_minor=9 |
|
Lines 455-467
Link Here
|
| 455 |
]) |
455 |
]) |
| 456 |
|
456 |
|
| 457 |
dnl |
457 |
dnl |
| 458 |
dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.X to 1. |
458 |
dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 6.X to 1. |
| 459 |
dnl |
459 |
dnl |
| 460 |
AC_DEFUN([APU_CHECK_DB_ALL], [ |
460 |
AC_DEFUN([APU_CHECK_DB_ALL], [ |
| 461 |
all_places=$1 |
461 |
all_places=$1 |
| 462 |
|
462 |
|
| 463 |
# Start version search at version 5.9 |
463 |
# Start version search at version 6.9 |
| 464 |
db_version=59 |
464 |
db_version=69 |
| 465 |
while [[ $db_version -ge 40 ]] |
465 |
while [[ $db_version -ge 40 ]] |
| 466 |
do |
466 |
do |
| 467 |
db_major=`echo $db_version | sed -e 's/.$//'` |
467 |
db_major=`echo $db_version | sed -e 's/.$//'` |
|
Lines 511-520
Link Here
|
| 511 |
apu_db_version=0 |
511 |
apu_db_version=0 |
| 512 |
|
512 |
|
| 513 |
# Maximum supported version announced in help string. |
513 |
# Maximum supported version announced in help string. |
| 514 |
# Although we search for all versions up to 5.9, |
514 |
# Although we search for all versions up to 6.9, |
| 515 |
# we should only include existing versions in our |
515 |
# we should only include existing versions in our |
| 516 |
# help string. |
516 |
# help string. |
| 517 |
db_max_version=53 |
517 |
db_max_version=60 |
| 518 |
db_min_version=41 |
518 |
db_min_version=41 |
| 519 |
dbm_list="sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4" |
519 |
dbm_list="sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4" |
| 520 |
db_version="$db_min_version" |
520 |
db_version="$db_min_version" |
|
Lines 525-531
Link Here
|
| 525 |
done |
525 |
done |
| 526 |
|
526 |
|
| 527 |
AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. |
527 |
AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. |
| 528 |
DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X} for some X=0,...,9])], |
528 |
DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X} for some X=0,...,9])], |
| 529 |
[ |
529 |
[ |
| 530 |
if test "$withval" = "yes"; then |
530 |
if test "$withval" = "yes"; then |
| 531 |
AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. |
531 |
AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. |
|
Lines 668-678
Link Here
|
| 668 |
eval "apu_use_$requested=1" |
668 |
eval "apu_use_$requested=1" |
| 669 |
apu_default_dbm=$requested |
669 |
apu_default_dbm=$requested |
| 670 |
;; |
670 |
;; |
| 671 |
db185 | db[[12345]]) |
671 |
db185 | db[[123456]]) |
| 672 |
apu_use_db=1 |
672 |
apu_use_db=1 |
| 673 |
apu_default_dbm=$requested |
673 |
apu_default_dbm=$requested |
| 674 |
;; |
674 |
;; |
| 675 |
db[[45]][[0-9]]) |
675 |
db[[456]][[0-9]]) |
| 676 |
apu_use_db=1 |
676 |
apu_use_db=1 |
| 677 |
apu_default_dbm=`echo $requested | sed -e 's/.$//'` |
677 |
apu_default_dbm=`echo $requested | sed -e 's/.$//'` |
| 678 |
;; |
678 |
;; |
