Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
openldap
OpenLDAP
Commits
1e7ca2e8
Commit
1e7ca2e8
authored
Jan 23, 2002
by
Kurt Zeilenga
Browse files
Add BDB compatibility check. Require Berkeley DB 3.3 or greater.
parent
cb8299d1
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
build/openldap.m4
View file @
1e7ca2e8
...
...
@@ -417,12 +417,31 @@ if test $ac_cv_header_db_h = yes; then
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 Find old Berkeley DB 1.85/1.86
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
AC_CACHE_CHECK([if Berkeley DB header compatibility], [ol_cv_header_db1],[
AC_EGREP_CPP(__db_version_1,[
...
...
configure
View file @
1e7ca2e8
This diff is collapsed.
Click to expand it.
configure.in
View file @
1e7ca2e8
...
...
@@ -799,8 +799,8 @@ dnl Checks for libraries
AC_CHECK_FUNC(dlopen, :, [AC_CHECK_LIB(dl, dlopen)])
dnl HP-UX requires -lV3
AC_CHECK_LIB(V3, sigset)
dnl HP-UX requires -lV3
(or not)
dnl
AC_CHECK_LIB(V3, sigset)
dnl The following is INTENTIONALLY scripted out because shell does not
dnl support variable names with the '@' character, which is what
...
...
@@ -1882,9 +1882,17 @@ if test $ol_with_ldbm_api = auto \
fi
if test $ol_enable_bdb = yes -a $ol_link_ldbm != berkeley ; then
AC_MSG_ERROR(BerkeleyDB not available)
elif test $ol_enable_bdb != no -a $ol_link_ldbm != berkeley ; then
ol_enable_bdb=yes
AC_MSG_ERROR(BDB: BerkeleyDB not available)
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
elif test $ol_enable_bdb = yes ; then
AC_MSG_ERROR(BDB: BerkeleyDB version incompatible)
else
ol_enable_bdb=no
fi
fi
if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then
...
...
include/portable.h.in
View file @
1e7ca2e8
...
...
@@ -580,9 +580,6 @@
/* Define if you have the <winsock2.h> header file. */
#undef HAVE_WINSOCK2_H
/* Define if you have the V3 library (-lV3). */
#undef HAVE_LIBV3
/* Define if you have the bind library (-lbind). */
#undef HAVE_LIBBIND
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment