[Patch] Detect DB 4.7
Jeff Sheltren <[email protected]>
| Newsgroups | gmane.comp.sysutils.cfengine.bugs |
|---|---|
| Message-ID | <[email protected]> |
Attached is a patch to configure.ac which will search for db 4.7 if available. This will be the case in Fedora 10 -- see https://bugzilla.redhat.com/show_bug.cgi?id=461942 Patch is against current svn (r601). Thanks, Jeff _______________________________________________ Bug-cfengine mailing list [email protected] https://cfengine.org/mailman/listinfo/bug-cfengine
cfengine-db47.patch
(application/octet-stream, 1.8 KB)
Index: configure.ac
===================================================================
--- configure.ac (revision 601)
+++ configure.ac (working copy)
@@ -108,7 +108,7 @@
AC_MSG_ERROR(This release of cfengine requires a version of BerkeleyDB 4.4 or later)
else
if test "x$BERKELEY_DB_DIR" = "xdefault" ; then
- for v in BerkeleyDB.4.2 BerkeleyDB.4.3 BerkeleyDB.4.4 BerkeleyDB.4.5 BerkeleyDB.4.6; do
+ for v in BerkeleyDB.4.2 BerkeleyDB.4.3 BerkeleyDB.4.4 BerkeleyDB.4.5 BerkeleyDB.4.6 BerkeleyDB.4.7; do
for d in $prefix /opt /usr/local /usr; do
test -d "$d/$v" && BERKELEY_DB_DIR="$d/$v"
done
@@ -134,7 +134,7 @@
CFLAGS="$CFLAGS $BERKELEY_DB_CFLAGS"
LDFLAGS="$LDFLAGS $BERKELEY_DB_LDFLAGS"
AC_SEARCH_LIBS(db_create,
- [db-4 db4 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0],
+ [db-4 db4 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0],
[BERKELEY_DB_LIB=$ac_cv_search_db_create])
CFLAGS="$save_CFLAGS"
LDFLAGS="$save_LDFLAGS"
@@ -184,7 +184,7 @@
elif test -d "$BERKELEY_DB_DIR"; then
BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
- for v in . db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db; do
+ for v in . db47 db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db; do
if test -f "$BERKELEY_DB_DIR/include/$v/db.h"; then
BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/$v"
break
@@ -192,7 +192,7 @@
done
BERKELEY_DB_LIB="-ldb"
- for v in db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44; do
+ for v in db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44; do
if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then
BERKELEY_DB_LIB="-l$v"
break