Commit 37477ebe authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

CLDAP fixes

look harder for BDB 4.1
parent 05a8de77
......@@ -8,8 +8,10 @@ OpenLDAP 2.1.14 Engineering
Fixed back-bdb group/atttribute txn code (ITS#2122)
Fixed back-bdb modrdn subtree rename bug (ITS#2336)
Fixed client tools krb4 handling
Fixed (historic) CLDAP support (ITS#2335)
Updated slapadd to complain about holes in the DIT
Build Environment
Look harder for BDB 4.1 (ITS#2339)
Documentation
Misc man page updates
......
......@@ -314,8 +314,10 @@ AC_DEFUN([OL_BERKELEY_DB_LINK],
OL_BERKELEY_DB_TRY(ol_cv_db_none)
OL_BERKELEY_DB_TRY(ol_cv_db_db41,[-ldb41])
OL_BERKELEY_DB_TRY(ol_cv_db_db_41,[-ldb-41])
OL_BERKELEY_DB_TRY(ol_cv_db_db4,[-ldb4])
OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_1,[-ldb-4.1])
OL_BERKELEY_DB_TRY(ol_cv_db_db_4_1,[-ldb-4-1])
OL_BERKELEY_DB_TRY(ol_cv_db_db_4,[-ldb-4])
OL_BERKELEY_DB_TRY(ol_cv_db_db4,[-ldb4])
OL_BERKELEY_DB_TRY(ol_cv_db_db,[-ldb])
OL_BERKELEY_DB_TRY(ol_cv_db_db3,[-ldb3])
OL_BERKELEY_DB_TRY(ol_cv_db_db_3,[-ldb-3])
......
......@@ -16871,13 +16871,13 @@ echo "$ac_t""$ol_cv_db_db_41" 1>&6
fi
 
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb4)""... $ac_c" 1>&6
echo "configure:16876: checking for Berkeley DB link (-ldb4)" >&5
if eval "test \"\${ol_cv_db_db4+set}\" = set"; then
echo $ac_n "checking for Berkeley DB link (-ldb-4.1)""... $ac_c" 1>&6
echo "configure:16876: checking for Berkeley DB link (-ldb-4.1)" >&5
if eval "test \"\${ol_cv_db_db_4_dot_1+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ol_DB_LIB=-ldb4
ol_DB_LIB=-ldb-4.1
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
......@@ -16931,12 +16931,12 @@ int main() {
EOF
if { (eval echo configure:16933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_db4=yes
ol_cv_db_db_4_dot_1=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
ol_cv_db_db4=no
ol_cv_db_db_4_dot_1=no
fi
rm -f conftest*
 
......@@ -16944,16 +16944,97 @@ rm -f conftest*
 
fi
 
echo "$ac_t""$ol_cv_db_db4" 1>&6
echo "$ac_t""$ol_cv_db_db_4_dot_1" 1>&6
 
if test $ol_cv_db_db4 = yes ; then
ol_cv_lib_db=-ldb4
if test $ol_cv_db_db_4_dot_1 = yes ; then
ol_cv_lib_db=-ldb-4.1
fi
fi
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb-4-1)""... $ac_c" 1>&6
echo "configure:16957: checking for Berkeley DB link (-ldb-4-1)" >&5
if eval "test \"\${ol_cv_db_db_4_1+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ol_DB_LIB=-ldb-4-1
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 16967 "configure"
#include "confdefs.h"
#ifdef HAVE_DB_185_H
# include <db_185.h>
#else
# include <db.h>
#endif
#ifndef DB_VERSION_MAJOR
# define DB_VERSION_MAJOR 1
#endif
#ifndef NULL
#define NULL ((void*)0)
#endif
int main() {
#if DB_VERSION_MAJOR > 1
{
char *version;
int major, minor, patch;
version = db_version( &major, &minor, &patch );
if( major != DB_VERSION_MAJOR ||
minor < DB_VERSION_MINOR )
{
printf("Berkeley DB version mismatch\n"
"\texpected: %s\n\tgot: %s\n",
DB_VERSION_STRING, version);
return 1;
}
}
#endif
#if DB_VERSION_MAJOR > 2
db_env_create( NULL, 0 );
#elif DB_VERSION_MAJOR > 1
db_appexit( NULL );
#else
(void) dbopen( NULL, 0, 0, 0, NULL);
#endif
; return 0; }
EOF
if { (eval echo configure:17014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_db_4_1=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
ol_cv_db_db_4_1=no
fi
rm -f conftest*
LIBS="$ol_LIBS"
fi
echo "$ac_t""$ol_cv_db_db_4_1" 1>&6
if test $ol_cv_db_db_4_1 = yes ; then
ol_cv_lib_db=-ldb-4-1
fi
fi
 
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb-4)""... $ac_c" 1>&6
echo "configure:16957: checking for Berkeley DB link (-ldb-4)" >&5
echo "configure:17038: checking for Berkeley DB link (-ldb-4)" >&5
if eval "test \"\${ol_cv_db_db_4+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -16963,7 +17044,7 @@ else
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
cat > conftest.$ac_ext <<EOF
#line 16967 "configure"
#line 17048 "configure"
#include "confdefs.h"
 
#ifdef HAVE_DB_185_H
......@@ -17010,7 +17091,7 @@ int main() {
 
; return 0; }
EOF
if { (eval echo configure:17014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:17095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_db_4=yes
else
......@@ -17032,9 +17113,90 @@ echo "$ac_t""$ol_cv_db_db_4" 1>&6
fi
fi
 
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb4)""... $ac_c" 1>&6
echo "configure:17119: checking for Berkeley DB link (-ldb4)" >&5
if eval "test \"\${ol_cv_db_db4+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ol_DB_LIB=-ldb4
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 17129 "configure"
#include "confdefs.h"
#ifdef HAVE_DB_185_H
# include <db_185.h>
#else
# include <db.h>
#endif
#ifndef DB_VERSION_MAJOR
# define DB_VERSION_MAJOR 1
#endif
#ifndef NULL
#define NULL ((void*)0)
#endif
int main() {
#if DB_VERSION_MAJOR > 1
{
char *version;
int major, minor, patch;
version = db_version( &major, &minor, &patch );
if( major != DB_VERSION_MAJOR ||
minor < DB_VERSION_MINOR )
{
printf("Berkeley DB version mismatch\n"
"\texpected: %s\n\tgot: %s\n",
DB_VERSION_STRING, version);
return 1;
}
}
#endif
#if DB_VERSION_MAJOR > 2
db_env_create( NULL, 0 );
#elif DB_VERSION_MAJOR > 1
db_appexit( NULL );
#else
(void) dbopen( NULL, 0, 0, 0, NULL);
#endif
; return 0; }
EOF
if { (eval echo configure:17176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_db4=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
ol_cv_db_db4=no
fi
rm -f conftest*
LIBS="$ol_LIBS"
fi
echo "$ac_t""$ol_cv_db_db4" 1>&6
if test $ol_cv_db_db4 = yes ; then
ol_cv_lib_db=-ldb4
fi
fi
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb)""... $ac_c" 1>&6
echo "configure:17038: checking for Berkeley DB link (-ldb)" >&5
echo "configure:17200: checking for Berkeley DB link (-ldb)" >&5
if eval "test \"\${ol_cv_db_db+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -17044,7 +17206,7 @@ else
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
cat > conftest.$ac_ext <<EOF
#line 17048 "configure"
#line 17210 "configure"
#include "confdefs.h"
 
#ifdef HAVE_DB_185_H
......@@ -17091,7 +17253,7 @@ int main() {
 
; return 0; }
EOF
if { (eval echo configure:17095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:17257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_db=yes
else
......@@ -17115,7 +17277,7 @@ fi
 
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb3)""... $ac_c" 1>&6
echo "configure:17119: checking for Berkeley DB link (-ldb3)" >&5
echo "configure:17281: checking for Berkeley DB link (-ldb3)" >&5
if eval "test \"\${ol_cv_db_db3+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -17125,7 +17287,7 @@ else
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
cat > conftest.$ac_ext <<EOF
#line 17129 "configure"
#line 17291 "configure"
#include "confdefs.h"
 
#ifdef HAVE_DB_185_H
......@@ -17172,7 +17334,7 @@ int main() {
 
; return 0; }
EOF
if { (eval echo configure:17176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:17338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_db3=yes
else
......@@ -17196,7 +17358,7 @@ fi
 
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb-3)""... $ac_c" 1>&6
echo "configure:17200: checking for Berkeley DB link (-ldb-3)" >&5
echo "configure:17362: checking for Berkeley DB link (-ldb-3)" >&5
if eval "test \"\${ol_cv_db_db_3+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -17206,7 +17368,7 @@ else
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
cat > conftest.$ac_ext <<EOF
#line 17210 "configure"
#line 17372 "configure"
#include "confdefs.h"
 
#ifdef HAVE_DB_185_H
......@@ -17253,7 +17415,7 @@ int main() {
 
; return 0; }
EOF
if { (eval echo configure:17257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:17419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_db_3=yes
else
......@@ -17277,7 +17439,7 @@ fi
 
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb2)""... $ac_c" 1>&6
echo "configure:17281: checking for Berkeley DB link (-ldb2)" >&5
echo "configure:17443: checking for Berkeley DB link (-ldb2)" >&5
if eval "test \"\${ol_cv_db_db2+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -17287,7 +17449,7 @@ else
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
cat > conftest.$ac_ext <<EOF
#line 17291 "configure"
#line 17453 "configure"
#include "confdefs.h"
 
#ifdef HAVE_DB_185_H
......@@ -17334,7 +17496,7 @@ int main() {
 
; return 0; }
EOF
if { (eval echo configure:17338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:17500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_db2=yes
else
......@@ -17358,7 +17520,7 @@ fi
 
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb-2)""... $ac_c" 1>&6
echo "configure:17362: checking for Berkeley DB link (-ldb-2)" >&5
echo "configure:17524: checking for Berkeley DB link (-ldb-2)" >&5
if eval "test \"\${ol_cv_db_db_2+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -17368,7 +17530,7 @@ else
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
cat > conftest.$ac_ext <<EOF
#line 17372 "configure"
#line 17534 "configure"
#include "confdefs.h"
 
#ifdef HAVE_DB_185_H
......@@ -17415,7 +17577,7 @@ int main() {
 
; return 0; }
EOF
if { (eval echo configure:17419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:17581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_db_2=yes
else
......@@ -17439,7 +17601,7 @@ fi
 
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb1)""... $ac_c" 1>&6
echo "configure:17443: checking for Berkeley DB link (-ldb1)" >&5
echo "configure:17605: checking for Berkeley DB link (-ldb1)" >&5
if eval "test \"\${ol_cv_db_db1+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -17449,7 +17611,7 @@ else
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
cat > conftest.$ac_ext <<EOF
#line 17453 "configure"
#line 17615 "configure"
#include "confdefs.h"
 
#ifdef HAVE_DB_185_H
......@@ -17496,7 +17658,7 @@ int main() {
 
; return 0; }
EOF
if { (eval echo configure:17500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:17662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_db1=yes
else
......@@ -17520,7 +17682,7 @@ fi
 
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb-1)""... $ac_c" 1>&6
echo "configure:17524: checking for Berkeley DB link (-ldb-1)" >&5
echo "configure:17686: checking for Berkeley DB link (-ldb-1)" >&5
if eval "test \"\${ol_cv_db_db_1+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -17530,7 +17692,7 @@ else
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
cat > conftest.$ac_ext <<EOF
#line 17534 "configure"
#line 17696 "configure"
#include "confdefs.h"
 
#ifdef HAVE_DB_185_H
......@@ -17577,7 +17739,7 @@ int main() {
 
; return 0; }
EOF
if { (eval echo configure:17581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:17743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_db_1=yes
else
......@@ -17612,17 +17774,17 @@ for ac_hdr in db.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:17616: checking for $ac_hdr" >&5
echo "configure:17778: checking for $ac_hdr" >&5
if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 17621 "configure"
#line 17783 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:17626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:17788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
......@@ -17652,7 +17814,7 @@ if test $ac_cv_header_db_h = yes; then
ol_cv_lib_db=no
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (default)""... $ac_c" 1>&6
echo "configure:17656: checking for Berkeley DB link (default)" >&5
echo "configure:17818: checking for Berkeley DB link (default)" >&5
if eval "test \"\${ol_cv_db_none+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -17662,7 +17824,7 @@ else
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
cat > conftest.$ac_ext <<EOF
#line 17666 "configure"
#line 17828 "configure"
#include "confdefs.h"
 
#ifdef HAVE_DB_185_H
......@@ -17709,7 +17871,7 @@ int main() {
 
; return 0; }
EOF
if { (eval echo configure:17713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:17875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_none=yes
else
......@@ -17733,7 +17895,7 @@ fi
 
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb41)""... $ac_c" 1>&6
echo "configure:17737: checking for Berkeley DB link (-ldb41)" >&5
echo "configure:17899: checking for Berkeley DB link (-ldb41)" >&5
if eval "test \"\${ol_cv_db_db41+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -17743,7 +17905,7 @@ else
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
cat > conftest.$ac_ext <<EOF
#line 17747 "configure"
#line 17909 "configure"
#include "confdefs.h"
 
#ifdef HAVE_DB_185_H
......@@ -17790,7 +17952,7 @@ int main() {
 
; return 0; }
EOF
if { (eval echo configure:17794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:17956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_db41=yes
else
......@@ -17814,7 +17976,7 @@ fi
 
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb-41)""... $ac_c" 1>&6
echo "configure:17818: checking for Berkeley DB link (-ldb-41)" >&5
echo "configure:17980: checking for Berkeley DB link (-ldb-41)" >&5
if eval "test \"\${ol_cv_db_db_41+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -17824,7 +17986,7 @@ else
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
cat > conftest.$ac_ext <<EOF
#line 17828 "configure"
#line 17990 "configure"
#include "confdefs.h"
 
#ifdef HAVE_DB_185_H
......@@ -17871,7 +18033,7 @@ int main() {
 
; return 0; }
EOF
if { (eval echo configure:17875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:18037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_db_41=yes
else
......@@ -17894,18 +18056,18 @@ echo "$ac_t""$ol_cv_db_db_41" 1>&6
fi
 
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb4)""... $ac_c" 1>&6
echo "configure:17899: checking for Berkeley DB link (-ldb4)" >&5
if eval "test \"\${ol_cv_db_db4+set}\" = set"; then
echo $ac_n "checking for Berkeley DB link (-ldb-4.1)""... $ac_c" 1>&6
echo "configure:18061: checking for Berkeley DB link (-ldb-4.1)" >&5
if eval "test \"\${ol_cv_db_db_4_dot_1+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ol_DB_LIB=-ldb4
ol_DB_LIB=-ldb-4.1
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
cat > conftest.$ac_ext <<EOF
#line 17909 "configure"
#line 18071 "configure"
#include "confdefs.h"
 
#ifdef HAVE_DB_185_H
......@@ -17952,14 +18114,14 @@ int main() {
 
; return 0; }
EOF
if { (eval echo configure:17956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:18118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_db4=yes
ol_cv_db_db_4_dot_1=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
ol_cv_db_db4=no
ol_cv_db_db_4_dot_1=no
fi
rm -f conftest*
 
......@@ -17967,16 +18129,97 @@ rm -f conftest*
 
fi
 
echo "$ac_t""$ol_cv_db_db4" 1>&6
echo "$ac_t""$ol_cv_db_db_4_dot_1" 1>&6
 
if test $ol_cv_db_db4 = yes ; then
ol_cv_lib_db=-ldb4
if test $ol_cv_db_db_4_dot_1 = yes ; then
ol_cv_lib_db=-ldb-4.1
fi
fi
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb-4-1)""... $ac_c" 1>&6
echo "configure:18142: checking for Berkeley DB link (-ldb-4-1)" >&5
if eval "test \"\${ol_cv_db_db_4_1+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ol_DB_LIB=-ldb-4-1
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 18152 "configure"
#include "confdefs.h"
#ifdef HAVE_DB_185_H
# include <db_185.h>
#else
# include <db.h>
#endif
#ifndef DB_VERSION_MAJOR
# define DB_VERSION_MAJOR 1
#endif
#ifndef NULL
#define NULL ((void*)0)
#endif
int main() {
#if DB_VERSION_MAJOR > 1
{
char *version;
int major, minor, patch;
version = db_version( &major, &minor, &patch );
if( major != DB_VERSION_MAJOR ||
minor < DB_VERSION_MINOR )
{
printf("Berkeley DB version mismatch\n"
"\texpected: %s\n\tgot: %s\n",
DB_VERSION_STRING, version);
return 1;
}
}
#endif
#if DB_VERSION_MAJOR > 2
db_env_create( NULL, 0 );
#elif DB_VERSION_MAJOR > 1
db_appexit( NULL );
#else
(void) dbopen( NULL, 0, 0, 0, NULL);
#endif
; return 0; }
EOF
if { (eval echo configure:18199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_db_db_4_1=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
ol_cv_db_db_4_1=no
fi
rm -f conftest*
LIBS="$ol_LIBS"
fi
echo "$ac_t""$ol_cv_db_db_4_1" 1>&6
if test $ol_cv_db_db_4_1 = yes ; then
ol_cv_lib_db=-ldb-4-1
fi
fi
 
if test $ol_cv_lib_db = no ; then
echo $ac_n "checking for Berkeley DB link (-ldb-4)""... $ac_c" 1>&6
echo "configure:17980: checking for Berkeley DB link (-ldb-4)" >&5
echo "configure:18223: checking for Berkeley DB link (-ldb-4)" >&5
if eval "test \"\${ol_cv_db_db_4+set}\" = set"; then