| 1 |
--- configure.in.orig 2011-01-13 21:12:40.420005851 +0100
|
| 2 |
+++ configure.in 2011-01-13 21:15:23.680008513 +0100
|
| 3 |
@@ -4456,16 +4456,17 @@
|
| 4 |
else return 1;
|
| 5 |
}
|
| 6 |
], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
|
| 7 |
- DB_LIB=
|
| 8 |
- for dbver in '' -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4; do
|
| 9 |
- AC_CHECK_LIB(db$dbver, dbopen, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] ,
|
| 10 |
- AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ]
|
| 11 |
+ save_LIBS="$LIBS"
|
| 12 |
+ for dbver in -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4 ''; do
|
| 13 |
+ AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break; ] ,
|
| 14 |
+ AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break; ]
|
| 15 |
)
|
| 16 |
)
|
| 17 |
done
|
| 18 |
if test -z "$DB_LIB" ; then
|
| 19 |
- AC_MSG_ERROR([db not installed or functional])
|
| 20 |
+ AC_CHECK_FUNC(dbopen, [], [ AC_MSG_ERROR([db not installed or functional]) ])
|
| 21 |
fi
|
| 22 |
+ LIBS="$save_LIBS"
|
| 23 |
SCPDEFS="$SCPDEFS -DSYSTEM_DB"
|
| 24 |
else
|
| 25 |
AC_MSG_RESULT([internal])
|
Parent Directory
| 
Revision Log