mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-30 13:30:57 +08:00
Add detection for Berkeley DB 4.5 libraries
This commit is contained in:
Kurt Zeilenga
parent
5e8207af12
commit
450dd65de4
@ -486,7 +486,12 @@ __db_version
|
||||
])
|
||||
|
||||
if test $ol_cv_bdb_major = 4 ; then
|
||||
if test $ol_cv_bdb_minor = 4 ; then
|
||||
if test $ol_cv_bdb_minor = 5 ; then
|
||||
OL_BERKELEY_DB_TRY(ol_cv_db_db45,[-ldb45])
|
||||
OL_BERKELEY_DB_TRY(ol_cv_db_db_45,[-ldb-45])
|
||||
OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_5,[-ldb-4.5])
|
||||
OL_BERKELEY_DB_TRY(ol_cv_db_db_4_5,[-ldb-4-5])
|
||||
elif test $ol_cv_bdb_minor = 4 ; then
|
||||
OL_BERKELEY_DB_TRY(ol_cv_db_db44,[-ldb44])
|
||||
OL_BERKELEY_DB_TRY(ol_cv_db_db_44,[-ldb-44])
|
||||
OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_4,[-ldb-4.4])
|
||||
|
||||
439
configure
vendored
439
configure
vendored
@ -27218,7 +27218,444 @@ echo "$as_me:$LINENO: result: $ol_cv_bdb_minor" >&5
|
||||
echo "${ECHO_T}$ol_cv_bdb_minor" >&6
|
||||
|
||||
if test $ol_cv_bdb_major = 4 ; then
|
||||
if test $ol_cv_bdb_minor = 4 ; then
|
||||
if test $ol_cv_bdb_minor = 5 ; then
|
||||
if test $ol_cv_lib_db = no ; then
|
||||
echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb45)" >&5
|
||||
echo $ECHO_N "checking for Berkeley DB link (-ldb45)... $ECHO_C" >&6
|
||||
if test "${ol_cv_db_db45+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
ol_DB_LIB=-ldb45
|
||||
ol_LIBS=$LIBS
|
||||
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end 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"
|
||||
"\theader: %s\n\tlibrary: %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;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ol_cv_db_db45=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ol_cv_db_db45=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
||||
LIBS="$ol_LIBS"
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ol_cv_db_db45" >&5
|
||||
echo "${ECHO_T}$ol_cv_db_db45" >&6
|
||||
|
||||
if test $ol_cv_db_db45 = yes ; then
|
||||
ol_cv_lib_db=-ldb45
|
||||
fi
|
||||
fi
|
||||
|
||||
if test $ol_cv_lib_db = no ; then
|
||||
echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-45)" >&5
|
||||
echo $ECHO_N "checking for Berkeley DB link (-ldb-45)... $ECHO_C" >&6
|
||||
if test "${ol_cv_db_db_45+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
ol_DB_LIB=-ldb-45
|
||||
ol_LIBS=$LIBS
|
||||
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end 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"
|
||||
"\theader: %s\n\tlibrary: %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;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ol_cv_db_db_45=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ol_cv_db_db_45=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
||||
LIBS="$ol_LIBS"
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ol_cv_db_db_45" >&5
|
||||
echo "${ECHO_T}$ol_cv_db_db_45" >&6
|
||||
|
||||
if test $ol_cv_db_db_45 = yes ; then
|
||||
ol_cv_lib_db=-ldb-45
|
||||
fi
|
||||
fi
|
||||
|
||||
if test $ol_cv_lib_db = no ; then
|
||||
echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.5)" >&5
|
||||
echo $ECHO_N "checking for Berkeley DB link (-ldb-4.5)... $ECHO_C" >&6
|
||||
if test "${ol_cv_db_db_4_dot_5+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
ol_DB_LIB=-ldb-4.5
|
||||
ol_LIBS=$LIBS
|
||||
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end 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"
|
||||
"\theader: %s\n\tlibrary: %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;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ol_cv_db_db_4_dot_5=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ol_cv_db_db_4_dot_5=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
||||
LIBS="$ol_LIBS"
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_5" >&5
|
||||
echo "${ECHO_T}$ol_cv_db_db_4_dot_5" >&6
|
||||
|
||||
if test $ol_cv_db_db_4_dot_5 = yes ; then
|
||||
ol_cv_lib_db=-ldb-4.5
|
||||
fi
|
||||
fi
|
||||
|
||||
if test $ol_cv_lib_db = no ; then
|
||||
echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-5)" >&5
|
||||
echo $ECHO_N "checking for Berkeley DB link (-ldb-4-5)... $ECHO_C" >&6
|
||||
if test "${ol_cv_db_db_4_5+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
ol_DB_LIB=-ldb-4-5
|
||||
ol_LIBS=$LIBS
|
||||
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end 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"
|
||||
"\theader: %s\n\tlibrary: %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;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ol_cv_db_db_4_5=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ol_cv_db_db_4_5=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
||||
LIBS="$ol_LIBS"
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ol_cv_db_db_4_5" >&5
|
||||
echo "${ECHO_T}$ol_cv_db_db_4_5" >&6
|
||||
|
||||
if test $ol_cv_db_db_4_5 = yes ; then
|
||||
ol_cv_lib_db=-ldb-4-5
|
||||
fi
|
||||
fi
|
||||
|
||||
elif test $ol_cv_bdb_minor = 4 ; then
|
||||
if test $ol_cv_lib_db = no ; then
|
||||
echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb44)" >&5
|
||||
echo $ECHO_N "checking for Berkeley DB link (-ldb44)... $ECHO_C" >&6
|
||||
|
||||
Loading…
Reference in New Issue
Block a user