View | Details | Raw Unified
Collapse All | Expand All

(-) patches/src680.orig/system-db-check.diff (-2 lines)
 Lines 12-18    Link Here  
-             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
-             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
-        ], []
-        ], []
-    )
-    )
+    for dbver in -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
 
+       AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
+       AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
+    done
+    done
+    if test "$DB_INCLUDES" = ""; then
+    if test "$DB_INCLUDES" = ""; then
 Lines 31-37    Link Here  
-    AC_HAVE_LIBRARY(db, [],
-    AC_HAVE_LIBRARY(db, [],
-      [AC_MSG_ERROR([db not installed or functional])], [])
-      [AC_MSG_ERROR([db not installed or functional])], [])
+    save_LIBS="$LIBS"
+    save_LIBS="$LIBS"
+    for dbver in -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
 
+       AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
+       AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
+    done
+    done
+    AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ])
+    AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ])