rse 99/11/28 06:01:05
Modified: src/modules/standard mod_auth_db.module
Log:
Ops, forgot to commit the corresponding changes to mod_auth_db.module
for supporting Berkeley-DB/3.x....
Revision Changes Path
1.7 +15 -16 apache-1.3/src/modules/standard/mod_auth_db.module
Index: mod_auth_db.module
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_auth_db.module,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_auth_db.module 1998/09/19 12:12:35 1.6
+++ mod_auth_db.module 1999/11/28 14:01:05 1.7
@@ -2,22 +2,21 @@
ConfigStart
DB_VERSION=''
DB_LIB=''
- if ./helpers/TestCompile func db_open; then
+ if ./helpers/TestCompile func db_create; then
+ DB_VERSION='Berkeley-DB/3.x'
+ elif ./helpers/TestCompile lib db db_create; then
+ DB_VERSION='Berkeley-DB/3.x'
+ DB_LIB='-ldb'
+ elif ./helpers/TestCompile func db_open; then
DB_VERSION='Berkeley-DB/2.x'
- else
- if ./helpers/TestCompile lib db db_open; then
- DB_VERSION='Berkeley-DB/2.x'
- DB_LIB='-ldb'
- else
- if ./helpers/TestCompile func dbopen; then
- DB_VERSION='Berkeley-DB/1.x'
- else
- if ./helpers/TestCompile lib db dbopen; then
- DB_VERSION='Berkeley-DB/1.x'
- DB_LIB='-ldb'
- fi
- fi
- fi
+ elif ./helpers/TestCompile lib db db_open; then
+ DB_VERSION='Berkeley-DB/2.x'
+ DB_LIB='-ldb'
+ elif ./helpers/TestCompile func dbopen; then
+ DB_VERSION='Berkeley-DB/1.x'
+ elif ./helpers/TestCompile lib db dbopen; then
+ DB_VERSION='Berkeley-DB/1.x'
+ DB_LIB='-ldb'
fi
if [ ".$DB_VERSION" != . ]; then
if [ ".$DB_LIB" != . ]; then
@@ -27,7 +26,7 @@
echo " using $DB_VERSION for mod_auth_db (-lc)"
fi
else
- echo "Error: Neither Berkeley-DB/1.x nor Berkeley-DB/2.x library
found."
+ echo "Error: None of Berkeley-DB 1.x, 2.x or 3.x libraries found."
echo " Either disable mod_auth_db or provide us with the paths"
echo " to the Berkeley-DB include and library files."
echo " (Hint: INCLUDES, LDFLAGS, LIBS)"
