mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-06 10:46:21 +08:00
Regenerated BDB version tests
This commit is contained in:
Howard Chu
parent
57cfcdcde7
commit
5d62b7dc20
440
configure
vendored
440
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.669 2008/09/10 22:35:12 hyc Exp .
|
||||
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.670 2008/09/16 05:43:27 hyc Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59.
|
||||
#
|
||||
@ -27454,10 +27454,8 @@ fi
|
||||
done
|
||||
|
||||
if test $ac_cv_header_db_h = yes; then
|
||||
ol_cv_lib_db=no
|
||||
|
||||
echo "$as_me:$LINENO: checking for Berkeley DB major version" >&5
|
||||
echo $ECHO_N "checking for Berkeley DB major version... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: checking for Berkeley DB major version in db.h" >&5
|
||||
echo $ECHO_N "checking for Berkeley DB major version in db.h... $ECHO_C" >&6
|
||||
if test "${ol_cv_bdb_major+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
@ -27465,107 +27463,15 @@ else
|
||||
ol_cv_bdb_major=0
|
||||
if test $ol_cv_bdb_major = 0 ; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <db.h>
|
||||
#ifndef DB_VERSION_MAJOR
|
||||
# define DB_VERSION_MAJOR 1
|
||||
#endif
|
||||
#if DB_VERSION_MAJOR == 4
|
||||
__db_version
|
||||
#endif
|
||||
__db_version DB_VERSION_MAJOR
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__db_version" >/dev/null 2>&1; then
|
||||
ol_cv_bdb_major=4
|
||||
else
|
||||
:
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
if test $ol_cv_bdb_major = 0 ; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <db.h>
|
||||
#ifndef DB_VERSION_MAJOR
|
||||
# define DB_VERSION_MAJOR 1
|
||||
#endif
|
||||
#if DB_VERSION_MAJOR == 3
|
||||
__db_version
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__db_version" >/dev/null 2>&1; then
|
||||
ol_cv_bdb_major=3
|
||||
else
|
||||
:
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
if test $ol_cv_bdb_major = 0 ; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <db.h>
|
||||
#ifndef DB_VERSION_MAJOR
|
||||
# define DB_VERSION_MAJOR 1
|
||||
#endif
|
||||
#if DB_VERSION_MAJOR == 2
|
||||
__db_version
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__db_version" >/dev/null 2>&1; then
|
||||
ol_cv_bdb_major=2
|
||||
else
|
||||
:
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
if test $ol_cv_bdb_major = 0 ; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <db.h>
|
||||
#ifndef DB_VERSION_MAJOR
|
||||
# define DB_VERSION_MAJOR 1
|
||||
#endif
|
||||
#if DB_VERSION_MAJOR == 1
|
||||
__db_version
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__db_version" >/dev/null 2>&1; then
|
||||
ol_cv_bdb_major=1
|
||||
else
|
||||
:
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
ol_cv_bdb_major=`$CPP conftest.$ac_ext | $EGREP __db_version | $SED 's/__db_version //'`
|
||||
fi
|
||||
|
||||
if test $ol_cv_bdb_major = 0 ; then
|
||||
@ -27578,8 +27484,8 @@ fi
|
||||
echo "$as_me:$LINENO: result: $ol_cv_bdb_major" >&5
|
||||
echo "${ECHO_T}$ol_cv_bdb_major" >&6
|
||||
|
||||
echo "$as_me:$LINENO: checking for Berkeley DB minor version" >&5
|
||||
echo $ECHO_N "checking for Berkeley DB minor version... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: checking for Berkeley DB minor version in db.h" >&5
|
||||
echo $ECHO_N "checking for Berkeley DB minor version in db.h... $ECHO_C" >&6
|
||||
if test "${ol_cv_bdb_minor+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
@ -27587,243 +27493,73 @@ else
|
||||
ol_cv_bdb_minor=0
|
||||
if test $ol_cv_bdb_minor = 0 ; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <db.h>
|
||||
#ifndef DB_VERSION_MINOR
|
||||
# define DB_VERSION_MINOR 0
|
||||
#endif
|
||||
#if DB_VERSION_MINOR == 9
|
||||
__db_version
|
||||
#endif
|
||||
__db_version DB_VERSION_MINOR
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__db_version" >/dev/null 2>&1; then
|
||||
ol_cv_bdb_minor=9
|
||||
else
|
||||
:
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
if test $ol_cv_bdb_minor = 0 ; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <db.h>
|
||||
#ifndef DB_VERSION_MINOR
|
||||
# define DB_VERSION_MINOR 0
|
||||
#endif
|
||||
#if DB_VERSION_MINOR == 8
|
||||
__db_version
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__db_version" >/dev/null 2>&1; then
|
||||
ol_cv_bdb_minor=8
|
||||
else
|
||||
:
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
if test $ol_cv_bdb_minor = 0 ; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <db.h>
|
||||
#ifndef DB_VERSION_MINOR
|
||||
# define DB_VERSION_MINOR 0
|
||||
#endif
|
||||
#if DB_VERSION_MINOR == 7
|
||||
__db_version
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__db_version" >/dev/null 2>&1; then
|
||||
ol_cv_bdb_minor=7
|
||||
else
|
||||
:
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
if test $ol_cv_bdb_minor = 0 ; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <db.h>
|
||||
#ifndef DB_VERSION_MINOR
|
||||
# define DB_VERSION_MINOR 0
|
||||
#endif
|
||||
#if DB_VERSION_MINOR == 6
|
||||
__db_version
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__db_version" >/dev/null 2>&1; then
|
||||
ol_cv_bdb_minor=6
|
||||
else
|
||||
:
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
if test $ol_cv_bdb_minor = 0 ; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <db.h>
|
||||
#ifndef DB_VERSION_MINOR
|
||||
# define DB_VERSION_MINOR 0
|
||||
#endif
|
||||
#if DB_VERSION_MINOR == 5
|
||||
__db_version
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__db_version" >/dev/null 2>&1; then
|
||||
ol_cv_bdb_minor=5
|
||||
else
|
||||
:
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
if test $ol_cv_bdb_minor = 0 ; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <db.h>
|
||||
#ifndef DB_VERSION_MINOR
|
||||
# define DB_VERSION_MINOR 0
|
||||
#endif
|
||||
#if DB_VERSION_MINOR == 4
|
||||
__db_version
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__db_version" >/dev/null 2>&1; then
|
||||
ol_cv_bdb_minor=4
|
||||
else
|
||||
:
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
if test $ol_cv_bdb_minor = 0 ; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <db.h>
|
||||
#ifndef DB_VERSION_MINOR
|
||||
# define DB_VERSION_MINOR 0
|
||||
#endif
|
||||
#if DB_VERSION_MINOR == 3
|
||||
__db_version
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__db_version" >/dev/null 2>&1; then
|
||||
ol_cv_bdb_minor=3
|
||||
else
|
||||
:
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
if test $ol_cv_bdb_minor = 0 ; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <db.h>
|
||||
#ifndef DB_VERSION_MINOR
|
||||
# define DB_VERSION_MINOR 0
|
||||
#endif
|
||||
#if DB_VERSION_MINOR == 2
|
||||
__db_version
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__db_version" >/dev/null 2>&1; then
|
||||
ol_cv_bdb_minor=2
|
||||
else
|
||||
:
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
if test $ol_cv_bdb_minor = 0 ; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <db.h>
|
||||
#ifndef DB_VERSION_MINOR
|
||||
# define DB_VERSION_MINOR 0
|
||||
#endif
|
||||
#if DB_VERSION_MINOR == 1
|
||||
__db_version
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__db_version" >/dev/null 2>&1; then
|
||||
ol_cv_bdb_minor=1
|
||||
else
|
||||
:
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
ol_cv_bdb_minor=`$CPP conftest.$ac_ext | $EGREP __db_version | $SED 's/__db_version //'`
|
||||
fi
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ol_cv_bdb_minor" >&5
|
||||
echo "${ECHO_T}$ol_cv_bdb_minor" >&6
|
||||
|
||||
echo "$as_me:$LINENO: checking if Berkeley DB version supported by BDB/HDB backends" >&5
|
||||
echo $ECHO_N "checking if Berkeley DB version supported by BDB/HDB backends... $ECHO_C" >&6
|
||||
if test "${ol_cv_bdb_compat+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <db.h>
|
||||
|
||||
/* this check could be improved */
|
||||
#ifndef DB_VERSION_MAJOR
|
||||
# define DB_VERSION_MAJOR 1
|
||||
#endif
|
||||
#ifndef DB_VERSION_MINOR
|
||||
# define DB_VERSION_MINOR 0
|
||||
#endif
|
||||
|
||||
#define DB_VERSION_MM ((DB_VERSION_MAJOR<<8)|DB_VERSION_MINOR)
|
||||
|
||||
/* require 4.4 or later */
|
||||
#if DB_VERSION_MM >= 0x0404
|
||||
__db_version_compat
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__db_version_compat" >/dev/null 2>&1; then
|
||||
ol_cv_bdb_compat=yes
|
||||
else
|
||||
ol_cv_bdb_compat=no
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ol_cv_bdb_compat" >&5
|
||||
echo "${ECHO_T}$ol_cv_bdb_compat" >&6
|
||||
|
||||
|
||||
if test $ol_cv_bdb_compat != yes ; then
|
||||
{ { echo "$as_me:$LINENO: error: BerkeleyDB version incompatible with BDB/HDB backends" >&5
|
||||
echo "$as_me: error: BerkeleyDB version incompatible with BDB/HDB backends" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
ol_cv_lib_db=no
|
||||
|
||||
if test $ol_cv_bdb_major = 4 ; then
|
||||
if test $ol_cv_lib_db = no ; then
|
||||
echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.$ol_cv_bdb_minor)" >&5
|
||||
@ -29361,8 +29097,8 @@ fi
|
||||
|
||||
if test "$ol_cv_lib_db" != no ; then
|
||||
ol_cv_berkeley_db=yes
|
||||
echo "$as_me:$LINENO: checking for Berkeley DB version match" >&5
|
||||
echo $ECHO_N "checking for Berkeley DB version match... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: checking for Berkeley DB library and header version match" >&5
|
||||
echo $ECHO_N "checking for Berkeley DB library and header version match... $ECHO_C" >&6
|
||||
if test "${ol_cv_berkeley_db_version+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
@ -29594,56 +29330,6 @@ _ACEOF
|
||||
BDB_LIBS="$BDB_LIBS $ol_cv_lib_db"
|
||||
fi
|
||||
|
||||
echo "$as_me:$LINENO: checking Berkeley DB version for BDB/HDB backends" >&5
|
||||
echo $ECHO_N "checking Berkeley DB version for BDB/HDB backends... $ECHO_C" >&6
|
||||
if test "${ol_cv_bdb_compat+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <db.h>
|
||||
|
||||
/* this check could be improved */
|
||||
#ifndef DB_VERSION_MAJOR
|
||||
# define DB_VERSION_MAJOR 1
|
||||
#endif
|
||||
#ifndef DB_VERSION_MINOR
|
||||
# define DB_VERSION_MINOR 0
|
||||
#endif
|
||||
|
||||
#define DB_VERSION_MM ((DB_VERSION_MAJOR<<8)|DB_VERSION_MINOR)
|
||||
|
||||
/* require 4.4 or later */
|
||||
#if DB_VERSION_MM >= 0x0404
|
||||
__db_version_compat
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__db_version_compat" >/dev/null 2>&1; then
|
||||
ol_cv_bdb_compat=yes
|
||||
else
|
||||
ol_cv_bdb_compat=no
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ol_cv_bdb_compat" >&5
|
||||
echo "${ECHO_T}$ol_cv_bdb_compat" >&6
|
||||
|
||||
|
||||
if test $ol_cv_bdb_compat != yes ; then
|
||||
{ { echo "$as_me:$LINENO: error: BDB/HDB: BerkeleyDB version incompatible" >&5
|
||||
echo "$as_me: error: BDB/HDB: BerkeleyDB version incompatible" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
SLAPD_LIBS="$SLAPD_LIBS \$(BDB_LIBS)"
|
||||
|
||||
ol_link_bdb=yes
|
||||
|
||||
Loading…
Reference in New Issue
Block a user