diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 125 |
2 files changed, 4 insertions, 125 deletions
@@ -1,3 +1,7 @@ +2003-11-18 JP Rosevear <jpr@ximian.com> + + * configure.in: remove db3 check + 2003-11-18 Rodrigo Moya <rodrigo@ximian.com> * tools/killev.c (main): kill the alarm notification service, not diff --git a/configure.in b/configure.in index 93fee0ae46..3fea9e31af 100644 --- a/configure.in +++ b/configure.in @@ -313,131 +313,6 @@ fi AM_CONDITIONAL(ENABLE_IPv6, test "x$enable_ipv6" = "xyes") -dnl *********** -dnl * db3 stuff -dnl *********** - -# To ensure that any copy of evolution of a given version can read -# the data files of any other copy, we require a precise db3 version. -# This can only change between Evolution versions (and then can only -# go up.) -evolution_db_version_major=3 -evolution_db_version_minor=1 -evolution_db_version_patch=17 - -evolution_db_version=${evolution_db_version_major}.${evolution_db_version_minor}.${evolution_db_version_patch} -AC_DEFINE_UNQUOTED(EVOLUTION_DB_VERSION_MAJOR,$evolution_db_version_major,[la]) -AC_DEFINE_UNQUOTED(EVOLUTION_DB_VERSION_MINOR,$evolution_db_version_minor,[la]) -AC_DEFINE_UNQUOTED(EVOLUTION_DB_VERSION_PATCH,$evolution_db_version_patch,[la]) - - -AC_ARG_WITH(db3, [ --with-db3=PREFIX Location of db3], - [with_db3_includes="$withval/include" - with_db3_libs="$withval/lib"]) -AC_ARG_WITH(db3-includes, [ --with-db3-includes=PATH Location of db3 includes], - with_db3_includes="$withval") -AC_ARG_WITH(db3-libs, [ --with-db3-libs=PATH Location of db3 libs], - with_db3_libs="$withval") - -if test -z "$with_db3_libs"; then - with_db3_libs="/usr/lib" -fi - -dnl The AC_CACHE_CHECK lets you avoid having to specify --with-db3 -dnl again with later configures -AC_CACHE_CHECK([for db3 compiler flags], ac_cv_db3_cflags, -[ - if test -n "${with_db3_includes}"; then - ac_cv_db3_cflags="-I$with_db3_includes" - fi -]) -DB3_CFLAGS=$ac_cv_db3_cflags -AC_SUBST(DB3_CFLAGS) - -CPPFLAGS_save="$CPPFLAGS" -CPPFLAGS="$DB3_CFLAGS $CPPFLAGS" -AC_CHECK_HEADERS(db.h db3/db.h, break) - -AC_CACHE_CHECK([db3 header version], ac_cv_db3_header_version, -[ - AC_TRY_COMPILE([ - #ifdef HAVE_DB3_DB_H - #include <db3/db.h> - #else - #include <db.h> - #endif - ],[ - #if DB_VERSION_MAJOR != $evolution_db_version_major || \ - DB_VERSION_MINOR != $evolution_db_version_minor || \ - DB_VERSION_PATCH != $evolution_db_version_patch - #error - #endif - ], :, AC_MSG_ERROR(Found db.h is not version $evolution_db_version)) - - ac_cv_db3_header_version=$evolution_db_version -]) - -AC_CACHE_CHECK([for db3 library name], ac_cv_db3_ldadd, -[ - LIBS_save="$LIBS" - ac_cv_db3_ldadd="" - - for name in db db3 db-3.1; do - LIBS="$LIBS_save $with_db3_libs/lib${name}.a -lpthread" - AC_TRY_LINK([ - #ifdef HAVE_DB3_DB_H - #include <db3/db.h> - #else - #include <db.h> - #endif - ],[ - DB *db; - db_create (&db, 0, 0); - ], [ - ac_cv_db3_ldadd="$with_db3_libs/lib${name}.a -lpthread" - break - ]) - done - LIBS="$LIBS_save" - - if test -z "$ac_cv_db3_ldadd"; then - AC_MSG_ERROR(Could not find db3 library) - fi -]) -DB3_LDADD=$ac_cv_db3_ldadd -AC_SUBST(DB3_LDADD) - -AC_CACHE_CHECK([that db3 library version matches header version], ac_cv_db3_lib_version_match, -[ - LIBS="$DB3_LDADD $LIBS -pthread" - AC_TRY_RUN([ - #ifdef HAVE_DB3_DB_H - #include <db3/db.h> - #else - #include <db.h> - #endif - - int - main (void) - { - int major, minor, patch; - - db_version (&major, &minor, &patch); - return !(major == DB_VERSION_MAJOR && - minor == DB_VERSION_MINOR && - patch == DB_VERSION_PATCH); - } - ], ac_cv_db3_lib_version_match=yes, ac_cv_db3_lib_version_match=no, - ac_cv_db3_lib_version_match=yes) -]) -if test "$ac_cv_db3_lib_version_match" = no; then - AC_MSG_ERROR(db3 headers and library do not match... multiple copies installed?) -fi - -CPPFLAGS="$CPPFLAGS_save" -LIBS="$LIBS_save" - - dnl ************************************************** dnl LDAP support. dnl ************************************************** |