Happy new year! (belated)

[openldap] / build / openldap.m4

diff --git a/build/openldap.m4 b/build/openldap.m4
index d55dabda2dc156c4c0577d38f903a6ee1e7891cb..6412277e43653e680fc25c8b868c2dfe9aaa5192 100644 (file)
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -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
@@ -486,7 +486,12 @@ __db_version
 ])
 
 if test $ol_cv_bdb_major = 4 ; then
-       if test $ol_cv_bdb_minor = 4 ; then
+       if test $ol_cv_bdb_minor = 5 ; then
+               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_dot_5,[-ldb-4.5])
+               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_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])
@@ -622,9 +627,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 +696,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-4.5 */
+#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 2) && (DB_VERSION_MINOR < 6)
        __db_version_compat
 #endif
        ], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])