Glibc 2.1 has Berkley db as -ldb1. Set up the autoconf to check this first,...

Glibc 2.1 has Berkley db as -ldb1. Set up the autoconf to check this first, else we will actually be using compat calls in db2, and not the real db1.

build/openldap.m4

@@ -260,7 +260,10 @@ AC_DEFUN([OL_LIB_BERKELEY_DB],
 [AC_CACHE_CHECK([for Berkeley DB library], [ol_cv_lib_db],
 [	ol_LIBS="$LIBS"
 	AC_CHECK_FUNC(dbopen,[ol_cv_lib_db=yes], [
-		AC_CHECK_LIB(db,dbopen,[ol_cv_lib_db=-ldb],[ol_cv_lib_db=no])
+		AC_CHECK_LIB(db1,dbopen,[ol_cv_lib_db=-ldb1],[
+			AC_CHECK_LIB(db,dbopen,[ol_cv_lib_db=-ldb]
+			[ol_cv_lib_db=no])
+		])
 	])
 	LIBS="$ol_LIBS"
 ])

configure.in

@@ -1225,7 +1225,7 @@ if test $ol_with_ldbm_api = manual ; then
 
 	AC_MSG_WARN([LDBM defines and link options must be set manually])
 
-	AC_CHECK_HEADERS(db.h db_185.h gdbm.h ndbm.h)
+	AC_CHECK_HEADERS(db1/db.h db.h db_185.h gdbm.h ndbm.h)
 fi
 
 if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then