]> git.sur5r.net Git - openldap/blobdiff - build/openldap.m4
ITS#5503 integerFilter keys were not terminated
[openldap] / build / openldap.m4
index 273a61c74ff767a5275b60d63230f2f8cf5a0e77..babfa5234a15b50c87ef9d632ac2ba116be602ab 100644 (file)
@@ -2,7 +2,7 @@ dnl OpenLDAP Autoconf Macros
 dnl $OpenLDAP$
 dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
 dnl
-dnl Copyright 1998-2006 The OpenLDAP Foundation.
+dnl Copyright 1998-2008 The OpenLDAP Foundation.
 dnl All rights reserved.
 dnl
 dnl Redistribution and use in source and binary forms, with or without
@@ -91,6 +91,7 @@ EOF
                        done
                        rm -f conftest*
                ])
+               test "$ol_cv_mkdep" = no && OL_MKDEP=":"
        else
                cc_cv_mkdep=yes
                OL_MKDEP_FLAGS="${MKDEP_FLAGS}"
@@ -486,26 +487,31 @@ __db_version
 ])
 
 if test $ol_cv_bdb_major = 4 ; then
-       if test $ol_cv_bdb_minor = 4 ; then
+       if test $ol_cv_bdb_minor = 6 ; then
+               OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_6,[-ldb-4.6])
+               OL_BERKELEY_DB_TRY(ol_cv_db_db46,[-ldb46])
+               OL_BERKELEY_DB_TRY(ol_cv_db_db_46,[-ldb-46])
+               OL_BERKELEY_DB_TRY(ol_cv_db_db_4_6,[-ldb-4-6])
+       elif test $ol_cv_bdb_minor = 5 ; then
+               OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_5,[-ldb-4.5])
+               OL_BERKELEY_DB_TRY(ol_cv_db_db45,[-ldb45])
+               OL_BERKELEY_DB_TRY(ol_cv_db_db_45,[-ldb-45])
+               OL_BERKELEY_DB_TRY(ol_cv_db_db_4_5,[-ldb-4-5])
+       elif test $ol_cv_bdb_minor = 4 ; then
+               OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_4,[-ldb-4.4])
                OL_BERKELEY_DB_TRY(ol_cv_db_db44,[-ldb44])
                OL_BERKELEY_DB_TRY(ol_cv_db_db_44,[-ldb-44])
-               OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_4,[-ldb-4.4])
                OL_BERKELEY_DB_TRY(ol_cv_db_db_4_4,[-ldb-4-4])
        elif test $ol_cv_bdb_minor = 3 ; then
+               OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_3,[-ldb-4.3])
                OL_BERKELEY_DB_TRY(ol_cv_db_db43,[-ldb43])
                OL_BERKELEY_DB_TRY(ol_cv_db_db_43,[-ldb-43])
-               OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_3,[-ldb-4.3])
                OL_BERKELEY_DB_TRY(ol_cv_db_db_4_3,[-ldb-4-3])
        elif test $ol_cv_bdb_minor = 2 ; then
+               OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_2,[-ldb-4.2])
                OL_BERKELEY_DB_TRY(ol_cv_db_db42,[-ldb42])
                OL_BERKELEY_DB_TRY(ol_cv_db_db_42,[-ldb-42])
-               OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_2,[-ldb-4.2])
                OL_BERKELEY_DB_TRY(ol_cv_db_db_4_2,[-ldb-4-2])
-       elif test $ol_cv_bdb_minor = 1 ; then
-               OL_BERKELEY_DB_TRY(ol_cv_db_db41,[-ldb41])
-               OL_BERKELEY_DB_TRY(ol_cv_db_db_41,[-ldb-41])
-               OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_1,[-ldb-4.1])
-               OL_BERKELEY_DB_TRY(ol_cv_db_db_4_1,[-ldb-4-1])
        fi
        OL_BERKELEY_DB_TRY(ol_cv_db_db_4,[-ldb-4])
        OL_BERKELEY_DB_TRY(ol_cv_db_db4,[-ldb4])
@@ -622,9 +628,9 @@ main()
        }
 
 #if (DB_VERSION_MAJOR > 3) || (DB_VERSION_MINOR >= 1)
-       rc = env->open( env, NULL, flags, 0 );
+       rc = (env->open)( env, NULL, flags, 0 );
 #else
-       rc = env->open( env, NULL, NULL, flags, 0 );
+       rc = (env->open)( env, NULL, NULL, flags, 0 );
 #endif
 
        if ( rc == 0 ) {
@@ -691,8 +697,8 @@ AC_DEFUN([OL_BDB_COMPAT],
 #      define DB_VERSION_MINOR 0
 #endif
 
-/* require 4.2 or later */
-#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 2)
+/* require 4.2 or later, but exclude 4.3 */
+#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 2) && (DB_VERSION_MINOR !=3)
        __db_version_compat
 #endif
        ], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
@@ -731,152 +737,6 @@ fi
 ])
 dnl
 dnl ====================================================================
-dnl Check if GDBM library exists
-dnl Check for gdbm_open in standard libraries or -lgdbm
-dnl
-dnl defines ol_cv_lib_gdbm to 'yes' or '-lgdbm' or 'no'
-dnl            'yes' implies gdbm_open is in $LIBS
-dnl
-dnl uses:
-dnl            AC_CHECK_FUNC(gdbm_open)
-dnl            AC_CHECK_LIB(gdbm,gdbm_open)
-dnl
-AC_DEFUN([OL_LIB_GDBM],
-[AC_CACHE_CHECK(for GDBM library, [ol_cv_lib_gdbm],
-[      ol_LIBS="$LIBS"
-       AC_CHECK_FUNC(gdbm_open,[ol_cv_lib_gdbm=yes], [
-               AC_CHECK_LIB(gdbm,gdbm_open,[ol_cv_lib_gdbm=-lgdbm],[ol_cv_lib_gdbm=no])
-       ])
-       LIBS="$ol_LIBS"
-])
-])dnl
-dnl
-dnl --------------------------------------------------------------------
-dnl Check if GDBM exists
-dnl
-dnl defines ol_cv_gdbm to 'yes' or 'no'
-dnl 
-dnl uses:
-dnl            OL_LIB_GDBM
-dnl            AC_CHECK_HEADERS(gdbm.h)
-dnl
-AC_DEFUN([OL_GDBM],
-[AC_REQUIRE([OL_LIB_GDBM])
- AC_CHECK_HEADERS(gdbm.h)
- AC_CACHE_CHECK(for db, [ol_cv_gdbm], [
-       if test $ol_cv_lib_gdbm = no || test $ac_cv_header_gdbm_h = no ; then
-               ol_cv_gdbm=no
-       else
-               ol_cv_gdbm=yes
-       fi
-])
- if test $ol_cv_gdbm = yes ; then
-       AC_DEFINE(HAVE_GDBM,1, [define if GNU DBM is available])
- fi
-])dnl
-dnl
-dnl ====================================================================
-dnl Check if MDBM library exists
-dnl Check for mdbm_open in standard libraries or -lmdbm
-dnl
-dnl defines ol_cv_lib_mdbm to 'yes' or '-lmdbm' or 'no'
-dnl            'yes' implies mdbm_open is in $LIBS
-dnl
-dnl uses:
-dnl            AC_CHECK_FUNC(mdbm_set_chain)
-dnl            AC_CHECK_LIB(mdbm,mdbm_set_chain)
-dnl
-AC_DEFUN([OL_LIB_MDBM],
-[AC_CACHE_CHECK(for MDBM library, [ol_cv_lib_mdbm],
-[      ol_LIBS="$LIBS"
-       AC_CHECK_FUNC(mdbm_set_chain,[ol_cv_lib_mdbm=yes], [
-               AC_CHECK_LIB(mdbm,mdbm_set_chain,[ol_cv_lib_mdbm=-lmdbm],[ol_cv_lib_mdbm=no])
-       ])
-       LIBS="$ol_LIBS"
-])
-])dnl
-dnl
-dnl --------------------------------------------------------------------
-dnl Check if MDBM exists
-dnl
-dnl defines ol_cv_mdbm to 'yes' or 'no'
-dnl 
-dnl uses:
-dnl            OL_LIB_MDBM
-dnl            AC_CHECK_HEADERS(mdbm.h)
-dnl
-AC_DEFUN([OL_MDBM],
-[AC_REQUIRE([OL_LIB_MDBM])
- AC_CHECK_HEADERS(mdbm.h)
- AC_CACHE_CHECK(for db, [ol_cv_mdbm], [
-       if test $ol_cv_lib_mdbm = no || test $ac_cv_header_mdbm_h = no ; then
-               ol_cv_mdbm=no
-       else
-               ol_cv_mdbm=yes
-       fi
-])
- if test $ol_cv_mdbm = yes ; then
-       AC_DEFINE(HAVE_MDBM,1, [define if MDBM is available])
- fi
-])dnl
-dnl
-dnl ====================================================================
-dnl Check if NDBM library exists
-dnl Check for dbm_open in standard libraries or -lndbm or -ldbm
-dnl
-dnl defines ol_cv_lib_ndbm to 'yes' or '-lndbm' or -ldbm or 'no'
-dnl            'yes' implies ndbm_open is in $LIBS
-dnl
-dnl uses:
-dnl            AC_CHECK_FUNC(dbm_open)
-dnl            AC_CHECK_LIB(ndbm,dbm_open)
-dnl            AC_CHECK_LIB(dbm,dbm_open)
-dnl
-dnl restrictions:
-dnl            should also check SVR4 case: dbm_open() in -lucb but that
-dnl            would requiring dealing with -L/usr/ucblib
-dnl
-AC_DEFUN([OL_LIB_NDBM],
-[AC_CACHE_CHECK(for NDBM library, [ol_cv_lib_ndbm],
-[      ol_LIBS="$LIBS"
-       AC_CHECK_FUNC(dbm_open,[ol_cv_lib_ndbm=yes], [
-               AC_CHECK_LIB(ndbm,dbm_open,[ol_cv_lib_ndbm=-lndbm], [
-                       AC_CHECK_LIB(dbm,dbm_open,[ol_cv_lib_ndbm=-ldbm],
-                               [ol_cv_lib_ndbm=no])dnl
-               ])
-       ])
-       LIBS="$ol_LIBS"
-])
-])dnl
-dnl
-dnl --------------------------------------------------------------------
-dnl Check if NDBM exists
-dnl
-dnl defines ol_cv_ndbm to 'yes' or 'no'
-dnl 
-dnl uses:
-dnl            OL_LIB_NDBM
-dnl            AC_CHECK_HEADERS(ndbm.h)
-dnl
-dnl restrictions:
-dnl            Doesn't handle SVR4 case (see above)
-dnl
-AC_DEFUN([OL_NDBM],
-[AC_REQUIRE([OL_LIB_NDBM])
- AC_CHECK_HEADERS(ndbm.h)
- AC_CACHE_CHECK(for db, [ol_cv_ndbm], [
-       if test $ol_cv_lib_ndbm = no || test $ac_cv_header_ndbm_h = no ; then
-               ol_cv_ndbm=no
-       else
-               ol_cv_ndbm=yes
-       fi
-])
- if test $ol_cv_ndbm = yes ; then
-       AC_DEFINE(HAVE_NDBM,1, [define if NDBM is available])
- fi
-])dnl
-dnl
-dnl ====================================================================
 dnl Check POSIX Thread version 
 dnl
 dnl defines ol_cv_pthread_version to 4, 5, 6, 7, 8, 10, depending on the