30 lines
1.2 KiB
Text
30 lines
1.2 KiB
Text
$NetBSD: patch-configure,v 1.3 2013/09/03 13:38:08 adam Exp $
|
|
|
|
Detect Berkeley DB.
|
|
|
|
--- configure.orig 2012-12-30 18:10:40.000000000 +0000
|
|
+++ configure
|
|
@@ -12169,12 +12169,11 @@ rm -f core conftest.err conftest.$ac_obj
|
|
OLDCFLAGS=$CFLAGS
|
|
OLDLDFLAGS=$LDFLAGS
|
|
OLDLIBS=$LIBS
|
|
- LIBS="-ldb $OLDLIBS"
|
|
- for DBVER in 54 53 52 51 50 49 48 47 46 45 44 43 42; do
|
|
+ for DBVER in 4 5 6; do
|
|
if test -d $libdbpath/include/db$DBVER; then
|
|
echo -n "checking for Berleley DB under $libdbpath/include/db$DBVER and $libdbpath/lib/db$DBVER... "
|
|
CFLAGS="-I$libdbpath/include/db$DBVER $OLDCFLAGS"
|
|
- LDFLAGS="-L$libdbpath/lib/db$DBVER $OLDLDFLAGS"
|
|
+ LDFLAGS="-L$libdbpath/lib -ldb$DBVER $OLDLDFLAGS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -12188,7 +12187,7 @@ rm -f core conftest.err conftest.$ac_obj
|
|
|
|
_ACEOF
|
|
if ac_fn_c_try_link "$LINENO"; then :
|
|
- echo yes;BDB_ADD_LDADD="-L$libdbpath/lib/db$DBVER -ldb"; BDB_ADD_FLAG="-I$libdbpath/include/db$DBVER";libdb="yes";
|
|
+ echo yes;BDB_ADD_LDADD="-L$libdbpath/lib -ldb$DBVER"; BDB_ADD_FLAG="-I$libdbpath/include/db$DBVER";libdb="yes";
|
|
else
|
|
libdb="no"; echo "no";
|
|
|