X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=810b2fa7f4d7cddaa014d0727a62cd13d1b7068f;hb=5791f9e938cad776c319e96ff7834a150cfa6961;hp=24b557375703efe20373a424f6f186bd237f286e;hpb=63192a4658a4f4afa0c1eff68806f265672c2182;p=openldap diff --git a/configure.in b/configure.in index 24b5573757..810b2fa7f4 100644 --- a/configure.in +++ b/configure.in @@ -303,11 +303,11 @@ SLAPD Backend Options:]) OL_ARG_ENABLE(backends,[ --enable-backends enable all available backends], --, [no yes mod])dnl -OL_ARG_ENABLE(deprecated_bdb,[ --enable-deprecated-bdb enable deprecated Berkeley DB backend. Will be removed in OpenLDAP 2.6], +OL_ARG_ENABLE(bdb,[ --enable-bdb enable Berkeley DB backend], no, [no yes mod], ol_enable_backends)dnl OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable dnssrv backend], no, [no yes mod], ol_enable_backends)dnl -OL_ARG_ENABLE(deprecated_hdb,[ --enable-deprecated-hdb enable deprecated Hierarchical DB backend. Will be removed in OpenLDAP 2.6], +OL_ARG_ENABLE(hdb,[ --enable-hdb enable Hierarchical DB backend], no, [no yes mod], ol_enable_backends)dnl OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend], no, [no yes mod], ol_enable_backends)dnl @@ -471,9 +471,9 @@ if test $ol_enable_slapd = no ; then ol_enable_rewrite=no elif test $ol_enable_modules != yes && - test $ol_enable_deprecated_bdb = no && + test $ol_enable_bdb = no && test $ol_enable_dnssrv = no && - test $ol_enable_deprecated_hdb = no && + test $ol_enable_hdb = no && test $ol_enable_ldap = no && test $ol_enable_mdb = no && test $ol_enable_meta = no && @@ -1207,6 +1207,13 @@ if test $ol_link_tls = no ; then AC_CHECK_HEADERS(gnutls/gnutls.h) if test $ac_cv_header_gnutls_gnutls_h = yes ; then + AC_PREPROC_IFELSE( + [[#include ] +[#if GNUTLS_VERSION_NUMBER < 0x020c00] +[#error "GnuTLS 2.12.0 or newer required"] +[#endif]], + , [AC_MSG_FAILURE([GnuTLS is too old])]) + AC_CHECK_LIB(gnutls, gnutls_init, [have_gnutls=yes], [have_gnutls=no]) @@ -1876,7 +1883,7 @@ fi dnl ---------------------------------------------------------------- ol_link_bdb=no -if test $ol_enable_deprecated_bdb/$ol_enable_deprecated_hdb != no/no; then +if test $ol_enable_bdb/$ol_enable_hdb != no/no; then OL_BERKELEY_DB if test $ol_cv_berkeley_db = no ; then @@ -1972,7 +1979,7 @@ if test $ol_enable_sql != no ; then ]) sql_LIBS="$LIBS" - LIBS="$LTHREAD_LIBS" + LIBS="$LTHREAD_LIBS $LIBS" if test $ol_with_odbc = auto ; then ol_with_odbc="iodbc unixodbc odbc32" @@ -2618,10 +2625,10 @@ if test "$ol_enable_monitor" != no ; then AC_DEFINE_UNQUOTED(SLAPD_MONITOR,$MFLAG,[define to support cn=Monitor backend]) fi -if test "$ol_enable_deprecated_bdb" != no ; then +if test "$ol_enable_bdb" != no ; then BUILD_SLAPD=yes - BUILD_BDB=$ol_enable_deprecated_bdb - if test "$ol_enable_deprecated_bdb" = mod ; then + BUILD_BDB=$ol_enable_bdb + if test "$ol_enable_bdb" = mod ; then SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-bdb" MFLAG=SLAPD_MOD_DYNAMIC else @@ -2644,10 +2651,10 @@ if test "$ol_enable_dnssrv" != no ; then AC_DEFINE_UNQUOTED(SLAPD_DNSSRV,$MFLAG,[define to support DNS SRV backend]) fi -if test "$ol_enable_deprecated_hdb" != no ; then +if test "$ol_enable_hdb" != no ; then BUILD_SLAPD=yes - BUILD_HDB=$ol_enable_deprecated_hdb - if test "$ol_enable_deprecated_hdb" = mod ; then + BUILD_HDB=$ol_enable_hdb + if test "$ol_enable_hdb" = mod ; then SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-hdb" MFLAG=SLAPD_MOD_DYNAMIC else