[monkey-bubble: 367/753] Get rid of the db check and --enable-prefer-db1
- From: Sven Herzberg <herzi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [monkey-bubble: 367/753] Get rid of the db check and --enable-prefer-db1
- Date: Wed, 14 Jul 2010 22:26:31 +0000 (UTC)
commit b31e7289a6b0dc8f11f4ece24ea3fe4f73da5f18
Author: Joe Shaw <joe ximian com>
Date: Sun Jun 3 17:52:12 2001 +0000
Get rid of the db check and --enable-prefer-db1
2001-06-03 Joe Shaw <joe ximian com>
* configure.in: Get rid of the db check and --enable-prefer-db1
ChangeLog | 4 ++++
configure.in | 40 ----------------------------------------
2 files changed, 4 insertions(+), 40 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index cb6850c..8df68b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-03 Joe Shaw <joe ximian com>
+
+ * configure.in: Get rid of the db check and --enable-prefer-db1
+
2001-05-30 Christophe Merlet <redfox eikonex org>
* configure.in: Added fr to $ALL_LINGUAS.
diff --git a/configure.in b/configure.in
index e4bfb5a..ab32717 100644
--- a/configure.in
+++ b/configure.in
@@ -55,46 +55,6 @@ if test "x$enable_rebuilds" = "xyes" && \
fi
AC_SUBST(REBUILD)
-AC_ARG_ENABLE(prefer-db1, [ --enable-prefer-db1 Prefer Berkeley DB 1.x],[prefer_db1="$enableval"],[prefer_db1=yes])
-dnl
-dnl Check for db stuff (gnome-metadata)
-dnl
-DB_LIB=
-AC_CHECK_FUNC(dbopen, [],
-if test "$prefer_db1" = "yes"; then
- AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1",
- AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb",
- AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3",
- AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode])
- )
- )
- )
-else
- AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb",
- AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1",
- AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3",
- AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode])
- )
- )
- )
-fi
-)
-
-dnl look for db headers
-if test "$prefer_db1" = "yes"; then
- AC_CHECK_HEADERS(db_185.h db1/db.h)
- if test "$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = nono; then
- AC_MSG_ERROR([Berkeley db library required for Gnome])
- fi
- AC_DEFINE(PREFER_DB1)
-else
- AC_CHECK_HEADERS(db.h db_185.h db1/db.h)
-
- if test "$ac_cv_header_db_h$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = nonono; then
- AC_MSG_ERROR([Berkeley db library required for Gnome])
- fi
-fi
-
dnl
dnl Start of pkg-config checks
dnl
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]