upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-21 15:19:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add BDB compatibility check. Require Berkeley DB 3.3 or greater.

Browse source
This commit is contained in:
Kurt Zeilenga 2002-01-23 19:08:07 +00:00
parent cb8299d124
commit 1e7ca2e850
4 changed files with 662 additions and 640 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
build/openldap.m4
View file

@ -417,12 +417,31 @@ if test $ac_cv_header_db_h = yes; then
fi fi
fi fi
]) ])
dnl dnl --------------------------------------------------------------------
dnl Check for version compatility with back-bdb
AC_DEFUN([OL_BDB_COMPAT],
[AC_CACHE_CHECK([Berkeley DB version for BDB backend], [ol_cv_bdb_compat],[
AC_EGREP_CPP(__db_version_compat,[
#include <db.h>
/* this check could be improved */
#ifndef DB_VERSION_MAJOR
# define DB_VERSION_MAJOR 1
#endif
/* require 3.3 or later */
#if DB_VERSION_MAJOR > 3
__db_version_compat
#elif DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR >= 3
__db_version_compat
#endif
], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
])
dnl -------------------------------------------------------------------- dnl --------------------------------------------------------------------
dnl Find old Berkeley DB 1.85/1.86 dnl Find old Berkeley DB 1.85/1.86
AC_DEFUN([OL_BERKELEY_COMPAT_DB], AC_DEFUN([OL_BERKELEY_COMPAT_DB],
[ol_cv_berkeley_db=no [AC_CHECK_HEADERS(db_185.h db.h)
AC_CHECK_HEADERS(db_185.h db.h)
if test $ac_cv_header_db_185_h = yes -o $ac_cv_header_db_h = yes; then if test $ac_cv_header_db_185_h = yes -o $ac_cv_header_db_h = yes; then
AC_CACHE_CHECK([if Berkeley DB header compatibility], [ol_cv_header_db1],[ AC_CACHE_CHECK([if Berkeley DB header compatibility], [ol_cv_header_db1],[
AC_EGREP_CPP(__db_version_1,[ AC_EGREP_CPP(__db_version_1,[

1252
configure vendored
View file

File diff suppressed because it is too large Load diff

16
configure.in
View file

@ -799,8 +799,8 @@ dnl Checks for libraries
AC_CHECK_FUNC(dlopen, :, [AC_CHECK_LIB(dl, dlopen)]) AC_CHECK_FUNC(dlopen, :, [AC_CHECK_LIB(dl, dlopen)])
dnl HP-UX requires -lV3 dnl HP-UX requires -lV3 (or not)
AC_CHECK_LIB(V3, sigset) dnl AC_CHECK_LIB(V3, sigset)
dnl The following is INTENTIONALLY scripted out because shell does not dnl The following is INTENTIONALLY scripted out because shell does not
dnl support variable names with the '@' character, which is what dnl support variable names with the '@' character, which is what
@ -1882,9 +1882,17 @@ if test $ol_with_ldbm_api = auto \
fi fi
if test $ol_enable_bdb = yes -a $ol_link_ldbm != berkeley ; then if test $ol_enable_bdb = yes -a $ol_link_ldbm != berkeley ; then
AC_MSG_ERROR(BerkeleyDB not available) AC_MSG_ERROR(BDB: BerkeleyDB not available)
elif test $ol_enable_bdb != no -a $ol_link_ldbm != berkeley ; then elif test $ol_enable_bdb != no -a $ol_link_ldbm = berkeley ; then
OL_BDB_COMPAT
if test $ol_cv_bdb_compat = yes ; then
ol_enable_bdb=yes ol_enable_bdb=yes
elif test $ol_enable_bdb = yes ; then
AC_MSG_ERROR(BDB: BerkeleyDB version incompatible)
else
ol_enable_bdb=no
fi
fi fi
if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then

3
include/portable.h.in
View file

@ -580,9 +580,6 @@
/* Define if you have the <winsock2.h> header file. */ /* Define if you have the <winsock2.h> header file. */
#undef HAVE_WINSOCK2_H #undef HAVE_WINSOCK2_H
/* Define if you have the V3 library (-lV3). */
#undef HAVE_LIBV3
/* Define if you have the bind library (-lbind). */ /* Define if you have the bind library (-lbind). */
#undef HAVE_LIBBIND #undef HAVE_LIBBIND