diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-09-19 19:14:05 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-09-19 19:14:05 +0000 |
| commit | 6e4a84d85e5c3bf88ae251eecc4f22ee95defaa7 (patch) | |
| tree | b41c226b54438ddb4ec830fc2a38da7c132675ba | |
| parent | c019eb5aefb94e8b62dd78f17e1cb82a1b63cacf (diff) | |
| download | gconf-6e4a84d85e5c3bf88ae251eecc4f22ee95defaa7.tar.gz | |
look for orbit-idl-2 not orbit-idl, add option to explicitly
2001-09-17 Havoc Pennington <hp@redhat.com>
* configure.in: look for orbit-idl-2 not orbit-idl,
add option to explicitly enable/disable bdb backend
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 17 |
2 files changed, 17 insertions, 5 deletions
@@ -1,3 +1,8 @@ +2001-09-17 Havoc Pennington <hp@redhat.com> + + * configure.in: look for orbit-idl-2 not orbit-idl, + add option to explicitly enable/disable bdb backend + 2001-09-08 Wang Jian <lark@linux.net.cn> * configure.in(ALL_LINGUAS): Renamed zh_CN.GB2312 to zh_CN. diff --git a/configure.in b/configure.in index 6345a27a..fbc62e23 100644 --- a/configure.in +++ b/configure.in @@ -137,15 +137,18 @@ AC_SUBST(DEPENDENT_WITH_XML_CFLAGS) AC_SUBST(DEPENDENT_WITH_GTK_LIBS) AC_SUBST(DEPENDENT_WITH_GTK_CFLAGS) +AC_ARG_ENABLE(bdbbackend, Enable BDB backend,,enable_bdbbackend=yes) + BDB_LIBS= BDB_CFLAGS= -AC_CHECK_LIB(db-3, db_env_create, BDB_LIBS=-ldb-3) - -AC_CHECK_HEADERS(db3/db.h) +if test "x$enable_bdbbackend" = "xyes"; then + AC_CHECK_LIB(db-3, db_env_create, BDB_LIBS=-ldb-3) + AC_CHECK_HEADERS(db3/db.h) +fi if test "x$BDB_LIBS" = x; then - AC_MSG_WARN(No db3 library found. Not building bdb backend.) + AC_MSG_WARN(No db3 library found or bdb not enabled. Not building bdb backend.) fi AM_CONDITIONAL(BDB, test -n "$BDB_LIBS") @@ -153,9 +156,13 @@ AM_CONDITIONAL(BDB, test -n "$BDB_LIBS") AC_SUBST(BDB_LIBS) AC_SUBST(BDB_CFLAGS) -AC_PATH_PROG(ORBIT_IDL, orbit-idl, no) +AC_PATH_PROG(ORBIT_IDL, orbit-idl-2, no) AC_SUBST(ORBIT_IDL) +if test x$ORBIT_IDL = xno; then + AC_MSG_ERROR([Could not find orbit-idl-2 in your path, should come with ORBit2]) +fi + AC_CHECK_LIB(popt, poptGetArg, POPT_LIBS=-lpopt, [AC_CHECK_HEADER(popt.h, , AC_MSG_ERROR([[ *** Couldn't find popt. Please download and install from |