[patch] db4-configure.patch

db4-configure.patch (text/plain), 1.82 KB, created by Holger Thon on 2004-09-01 06:23:42 UTC

--- inn-2.4.1.orig/configure.in	2004-01-07 22:47:19.000000000 +0000
+++ inn-2.4.1/configure.in	2004-09-01 12:52:15.072969968 +0000
@@ -364,8 +364,9 @@
     AC_MSG_RESULT(yes)
     AC_MSG_CHECKING(for BerkeleyDB location)
     if test x"$BERKELEY_DB_DIR" = xyes ; then
-        for v in BerkeleyDB BerkeleyDB.3.0 BerkeleyDB.3.1 BerkeleyDB.3.2 \
-                 BerkeleyDB.3.3 BerkeleyDB.4.0 BerkeleyDB.4.1 ; do
+        for v in BerkeleyDB4.2 BerkeleyDB.4.2 BerkeleyDB4.1 BerkeleyDB.4.1 \
+		BerkeleyDB4.0 BerkeleyDB.4.0 BerkeleyDB.3.3 BerkeleyDB.3.2 \
+		BerkeleyDB.3.1 BerkeleyDB.3.0 ; do 
             for d in $prefix /usr/local /opt /usr ; do
                 if test -d "$d/$v" ; then
                     BERKELEY_DB_DIR="$d/$v"
@@ -375,7 +376,7 @@
         done
     fi
     if test x"$BERKELEY_DB_DIR" = xyes ; then
-        for v in db41 db4 db3 db2 ; do
+        for v in db42 db41 db4 db3 db2 ; do
             if test -d "/usr/local/include/$v" ; then
                 BERKELEY_DB_LDFLAGS="-L/usr/local/lib"
                 BERKELEY_DB_CFLAGS="-I/usr/local/include/$v"
@@ -385,10 +386,14 @@
             fi
         done
         if test x"$BERKELEY_DB_LIB" = x ; then
-            for v in db41 db4 db3 db2 ; do
-                if test -d "/usr/include/$v" ; then
-                    BERKELEY_DB_CFLAGS="-I/usr/include/$v"
-                    BERKELEY_DB_LIB="-l$v"
+            for v in 4.2 42 4.1 41 4.0 4 3 2 ; do
+                if test -d "/usr/include/db$v" ; then
+                    BERKELEY_DB_CFLAGS="-I/usr/include/db$v"
+                    if test -f "/usr/lib/libdb-$v.so" ; then
+                        BERKELEY_DB_LIB="-ldb-$v"
+                    else
+                        BERKELEY_DB_LIB="-ldb$v"
+                    fi
                     AC_MSG_RESULT(Linux locations)
                     break
                 fi