Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 285679
Collapse All | Expand All

(-)patches/dev300/system-db-check.diff.orig (-4 / +6 lines)
Lines 12-25 Link Here
12
-             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
12
-             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
13
-        ], []
13
-        ], []
14
-    )
14
-    )
15
+    for dbver in -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
15
-    AC_MSG_CHECKING([whether db is at least 4.1])
16
-    for v in `seq 1 7`; do
17
+    for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
16
+       AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
18
+       AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
17
+    done
19
+    done
18
+    if test "$DB_INCLUDES" = ""; then
20
+    if test "$DB_INCLUDES" = ""; then
19
+       AC_MSG_ERROR(no. install the db4-dev package)
21
+       AC_MSG_ERROR(no. install the db4-dev package)
20
+    fi
22
+    fi
21
     AC_MSG_CHECKING([whether db is at least 4.1])
23
+     AC_MSG_CHECKING([whether db is at least 4.1])
22
     for v in 1 2 3 4 5; do
24
+    for v in `seq 1 8`; do
23
        AC_TRY_RUN([
25
        AC_TRY_RUN([
24
@@ -3302,12 +3300,13 @@
26
@@ -3302,12 +3300,13 @@
25
     else
27
     else
Lines 32-38 Link Here
32
-      [AC_MSG_ERROR([db not installed or functional])], [])
34
-      [AC_MSG_ERROR([db not installed or functional])], [])
33
-    SCPDEFS="$SCPDEFS -DSYSTEM_DB"
35
-    SCPDEFS="$SCPDEFS -DSYSTEM_DB"
34
+    save_LIBS="$LIBS"
36
+    save_LIBS="$LIBS"
35
+    for dbver in -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
37
+    for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
36
+       AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
38
+       AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
37
+    done
39
+    done
38
+    AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ])
40
+    AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ])

Return to bug 285679