]> git.sur5r.net Git - openldap/blobdiff - configure.in
safe_string_free was freeing the string value, so we have to save it.
[openldap] / configure.in
index 8f39b35cb813d8cf5cbbbfbb736ad4abf330de59..c99f7a0fab0bb822e558bda0c69820395abb61ce 100644 (file)
@@ -7,14 +7,27 @@ dnl license is available at http://www.OpenLDAP.org/license.html or
 dnl in file LICENSE in the top-level directory of the distribution.
 dnl
 
+dnl Disable config.cache!
+define([AC_CACHE_LOAD], )dnl
+define([AC_CACHE_SAVE], )dnl
+
 dnl Configure.in for OpenLDAP
-AC_INIT(include/ldap.h)dnl
+AC_INIT(build/version)dnl
 AC_CONFIG_AUX_DIR(build)dnl
-AM_INIT_AUTOMAKE(OpenLDAP,[2.0-devel], [no ac_define])dnl
 
-dnl Do not use AutoConf 2.12; it produces a configuration script
-dnl that causes an "internal 2K buffer" error on HPUX when run
-dnl with /bin/sh.  Autoconf 2.10 seems to be okay.
+OL_VERSION=`cat $ac_aux_dir/version`
+if test -z "$OL_VERSION"; then
+       AC_MSG_ERROR([could not determine version])
+fi
+
+AM_INIT_AUTOMAKE(OpenLDAP,[$OL_VERSION], [no defines])dnl
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)
+AC_DEFINE_UNQUOTED(OPENLDAP_VERSION,"$VERSION",Version)
+
+dnl We use autoconf features new to 2.13.
+dnl    aclocal.m4 should be built using aclocal from automake 1.4
 AC_PREREQ(2.13)dnl Required Autoconf version
 
 AC_CONFIG_HEADER(include/portable.h include/ldap_features.h)dnl
@@ -27,6 +40,8 @@ AC_PREFIX_DEFAULT(/usr/local)
 top_builddir=`pwd`
 AC_SUBST(top_builddir)dnl
 
+AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion])
+
 ldap_subdir="openldap"
 
 AC_ARG_WITH(subdir, [  --with-subdir=DIR change default subdirectory used for installs], [
@@ -40,8 +55,8 @@ AC_ARG_WITH(subdir, [  --with-subdir=DIR change default subdirectory used for in
 AC_SUBST(ldap_subdir)dnl
 
 OL_ARG_ENABLE(debug,[  --enable-debug  enable debugging], yes)dnl
-ol_enable_syslog=no
-dnl OL_ARG_ENABLE(syslog,[  --enable-syslog    enable syslog support], auto)dnl
+dnl ol_enable_syslog=no
+OL_ARG_ENABLE(syslog,[  --enable-syslog        enable syslog support], auto)dnl
 OL_ARG_ENABLE(proctitle,[  --enable-proctitle  enable proctitle support], yes)dnl
 OL_ARG_ENABLE(cache,[  --enable-cache  enable caching], yes)dnl
 OL_ARG_ENABLE(dns,[  --enable-dns              enable V2 DNS  extension], no)dnl
@@ -50,14 +65,17 @@ OL_ARG_ENABLE(cldap,[  --enable-cldap       enable connectionless ldap], no)dnl
 OL_ARG_ENABLE(x_compile,[  --enable-x-compile  enable cross compiling],
        no, [yes no])dnl
 
-
 dnl General "with" options
 OL_ARG_ENABLE(dmalloc,[  --enable-dmalloc      enable debug malloc support], no)dnl
 
-OL_ARG_WITH(kerberos,[  --with-kerberos        use Kerberos],
+OL_ARG_WITH(kerberos,[  --with-kerberos        with Kerberos support],
        auto, [auto k5 k4 afs yes no])
+OL_ARG_WITH(readline,[  --with-readline  with readline support],
+       auto, [auto yes no] )
 OL_ARG_WITH(threads,[  --with-threads  use threads],
        auto, [auto posix mach lwp yes no manual] )
+OL_ARG_WITH(tls,[  --with-tls  with TLS/SSL support],
+       auto, [auto ssleay openssl yes no] )
 OL_ARG_WITH(yielding_select,[  --with-yielding-select  with implicitly yielding select],
        auto, [auto yes no manual] )
 
@@ -73,21 +91,24 @@ OL_ARG_ENABLE(slapd,[  --enable-slapd       enable building slapd], yes)dnl
 OL_ARG_ENABLE(aclgroups,[    --enable-aclgroups        enable ACL group support], auto)dnl
 OL_ARG_ENABLE(cleartext,[    --enable-cleartext        enable cleartext passwords], yes)dnl
 OL_ARG_ENABLE(crypt,[    --enable-crypt        enable crypt(3) passwords], auto)dnl
-OL_ARG_ENABLE(wrappers,[    --enable-wrappers  enable tcp wrapper support], no)dnl
+OL_ARG_ENABLE(modules,[    --enable-modules    enable dynamic module support], no)dnl
 OL_ARG_ENABLE(phonetic,[    --enable-phonetic  enable phonetic/soundex], no)dnl
 OL_ARG_ENABLE(rlookups,[    --enable-rlookups  enable reverse lookups], auto)dnl
+OL_ARG_ENABLE(wrappers,[    --enable-wrappers  enable tcp wrapper support], no)dnl
 
 dnl SLAPD Backend options
 OL_ARG_ENABLE(bdb2,[    --enable-bdb2  enable bdb2 backend], no)dnl
+OL_ARG_ENABLE(ldap,[    --enable-ldap  enable ldap backend], no)dnl
 OL_ARG_ENABLE(ldbm,[    --enable-ldbm  enable ldbm backend], yes)dnl
 OL_ARG_WITH(ldbm_api,[      --with-ldbm-api    use LDBM API], auto,
-       [auto db2 db gdbm ndbm manual])
+       [auto db2 db mdbm gdbm ndbm manual])
 OL_ARG_WITH(ldbm_type,[      --with-ldbm-type  use LDBM type], auto,
        [auto btree hash])
 
 OL_ARG_ENABLE(passwd,[    --enable-passwd      enable passwd backend], no)dnl
 OL_ARG_ENABLE(perl,[    --enable-perl  enable perl backend], no)dnl
 OL_ARG_ENABLE(shell,[    --enable-shell        enable shell backend], no)dnl
+OL_ARG_ENABLE(tcl,[    --enable-tcl    enable tcl backend], no)dnl
 
 dnl SLURPD OPTIONS
 AC_ARG_WITH(xxslurpdoptions,[SLURPD Options:])
@@ -127,9 +148,15 @@ if test $ol_enable_slapd = no ; then
        if test $ol_enable_shell = yes ; then
                AC_MSG_WARN([slapd disabled, ignoring --enable_shell argument])
        fi
+       if test $ol_enable_tcl = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable_tcl argument])
+       fi
        if test $ol_enable_aclgroups = yes ; then
                AC_MSG_WARN([slapd disabled, ignoring --enable_aclgroups argument])
        fi
+       if test $ol_enable_modules = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable_modules argument])
+       fi
        if test $ol_enable_wrappers = yes ; then
                AC_MSG_WARN([slapd disabled, ignoring --enable_wrappers argument])
        fi
@@ -155,12 +182,17 @@ if test $ol_enable_slapd = no ; then
        ol_enable_passwd=no
        ol_enable_perl=no
        ol_enable_shell=no
+       ol_enable_tcl=no
+
        ol_enable_aclgroups=no
-       ol_enable_wrappers=no
+       ol_enable_modules=no
        ol_enable_phonetic=no
        ol_enable_rlookups=no
+       ol_enable_wrappers=no
+
        ol_with_ldbm_api=no
        ol_with_ldbm_type=no
+
        ol_enable_slurpd=no
 
 elif test $ol_enable_ldbm = no ; then
@@ -174,13 +206,15 @@ elif test $ol_enable_ldbm = no ; then
                AC_MSG_WARN([LDBM disabled, ignoring --with_ldbm_type argument])
        fi
 
-       if test $ol_enable_ldbm = yes ; then
+       if test $ol_enable_bdb2 = yes ; then
                AC_MSG_ERROR([BDB2 requires --enable-ldbm])
        fi
 
-       if test $ol_enable_passwd = no -a \
+       if test $ol_enable_modules != yes -a \
+               $ol_enable_passwd = no -a \
                $ol_enable_perl = no -a \
-               $ol_enable_shell = no ; then
+               $ol_enable_shell = no -a \
+               $ol_enable_tcl = no ; then
                AC_MSG_ERROR([slapd requires a backend])
        fi
 
@@ -212,6 +246,10 @@ else
                $ol_with_ldbm_type = btree ; then
                AC_MSG_ERROR([GDBM only supports LDBM type hash])
        fi
+       if test $ol_with_ldbm_api = mdbm -a \
+               $ol_with_ldbm_type = btree ; then
+               AC_MSG_ERROR([MDBM only supports LDBM type hash])
+       fi
        if test $ol_with_ldbm_api = ndbm -a \
                $ol_with_ldbm_type = btree ; then
                AC_MSG_ERROR([NDBM only supports LDBM type hash])
@@ -227,8 +265,6 @@ fi
 
 AC_MSG_RESULT(done)
 
-AC_CANONICAL_HOST
-
 ## Initialize vars
 LDAP_LIBS=
 LDBM_LIBS=
@@ -244,42 +280,86 @@ BUILD_SLAPD=no
 BUILD_SLURPD=no
 
 BUILD_BDB2=no
+BUILD_LDAP=no
 BUILD_LDBM=no
 BUILD_PASSWD=no
 BUILD_PERL=no
 BUILD_SHELL=no
+BUILD_TCL=no
 BUILD_THREAD=no
 
+SLAPD_MODULES_LDFLAGS=
+SLAPD_MODULES_CPPFLAGS=
+
 SLAPD_PERL_LDFLAGS=
 SLAPD_PERL_CPPFLAGS=
 
 KRB_LIBS=
+READLINE_LIBS=
 TERMCAP_LIBS=
+TLS_LIBS=
 
 dnl ----------------------------------------------------------------
 dnl Checks for programs
 
-AC_PROG_INSTALL
+dnl AC_PROG_INSTALL
+
+dnl The default compiler is cc (NOT gcc)
+CC=${CC-"cc"}
+dnl The default CFLAGS is empty NOT whatever AC_PROG_CC sets.
+dnl CFLAGS=${CFLAGS-""}
+
 AM_PROG_LIBTOOL
 dnl AC_PROG_MAKE_SET
 
 AC_PROG_AWK
+OL_PROG_LN_H
 AC_PROG_LN_S
 
+if test "$LN_H" = "cp" -a "$LN_S" = "ln"; then
+       LN_S="$LN_H"
+fi
+
 AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail,
        $PATH:/usr/libexec:/usr/lib:/usr/sbin:/usr/etc:/etc)
 AC_PATH_PROG(EDITOR, vi, /usr/ucb/vi, $PATH:/usr/ucb)
 AC_PATH_PROG(FINGER, finger, /usr/ucb/finger, $PATH:/usr/ucb)
 
-if test $ol_enable_perl = yes ; then
+ol_link_modules=no
+if test $ol_enable_modules != no ; then
+       AC_PATH_PROG(GLIBCONFIG, glib-config)
+
+       if test "no$GLIBCONFIG" = "no" ; then
+               if test $ol_enable_modules = yes ; then
+                       AC_MSG_ERROR([could not locate glib-config])
+               fi
+
+       else
+               SLAPD_MODULES_VERSION="`$GLIBCONFIG --version gmodule`"
+               SLAPD_MODULES_CPPFLAGS="`$GLIBCONFIG --cflags gmodule`"
+               SLAPD_MODULES_LDFLAGS="`$GLIBCONFIG --libs gmodule`"
+
+               dnl should check glib version
+               ol_link_modules=yes
+       fi
+fi
+
+ol_link_perl=no
+if test $ol_enable_perl != no ; then
        AC_PATH_PROG(PERLBIN, perl, /usr/bin/perl)
 
        if test "no$PERLBIN" = "no" ; then
-               ol_enable_perl=no
-       fi
+               if test $ol_enable_perl = yes ; then
+                       AC_MSG_ERROR([could not locate perl])
+               fi
 
-       SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`"
-       SLAPD_PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e perl_inc`"
+       else
+               SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`"
+               SLAPD_PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`"
+
+               dnl should check perl version
+               ol_link_perl=yes
+       fi
 fi
 
 AC_PROG_CPP
@@ -301,12 +381,17 @@ AC_AIX
 AC_ISC_POSIX
 AC_MINIX
 
+dnl BeOS requires -lbe -lroot -lnet
+AC_CHECK_LIB(be, be_app, [LIBS="$LIBS -lbe -lroot -lnet"], :, [-lroot -lnet])
+
 dnl Checks for system services
 AC_CYGWIN
 AC_MINGW32
 AC_EXEEXT
 AC_OBJEXT
 
+AC_DEFINE_UNQUOTED( EXEEXT, "${EXEEXT}", [defined to be the EXE extension])
+
 dnl OpenLDAP requires STDC features
 AM_PROG_CC_STDC
 if test "X${am_cv_prog_cc_stdc}" = "Xno" ; then
@@ -322,12 +407,13 @@ dnl Likely combinations:
 dnl            -lsocket [ -lnsl_s | -lnsl ]
 dnl            -linet
 
-AC_CHECK_FUNC(socket, [have_socket=yes], [     
+AC_CHECK_FUNC(socket, :, [     
 dnl
 dnl hopefully we won't include too many libraries
 dnl
        AC_CHECK_LIB(socket, main)
        AC_CHECK_LIB(net, main)
+       AC_CHECK_LIB(net, socket)
        AC_CHECK_LIB(nsl_s, main)
        AC_CHECK_LIB(nsl, main)
        AC_CHECK_LIB(inet, socket)
@@ -351,6 +437,13 @@ fi
 dnl HP-UX requires -lV3
 AC_CHECK_LIB(V3, sigset)
 
+AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.]))
+
+dnl Select arg types
+dnl (if this detection becomes permenent, it and the select() detection
+dnl should be done before the yielding select test) 
+AC_FUNC_SELECT_ARGTYPES
+
 # ISODE tests
 ol_link_isode=no
 if test $ol_enable_ldapd != no ; then
@@ -417,7 +510,7 @@ des_debug = 1;
                                LIBS="$save_LIBS"
                        ])
 
-                       if test $ol_cv_var_des_debug= yes ; then
+                       if test $ol_cv_var_des_debug = yes ; then
                                AC_DEFINE(HAVE_DES_DEBUG,1,
                                        [define if you have Kerberos des_debug])
                        fi
@@ -446,6 +539,91 @@ if test $ol_link_kerberos = yes ; then
        AC_DEFINE(HAVE_KERBEROS, 1, [define if you have Kerberos])
 fi
 
+dnl
+dnl Check for SSL/TLS
+dnl
+ol_link_tls=no
+if test $ol_with_tls != no ; then
+       
+       AC_CHECK_HEADERS(ssl.h)
+       
+       if test $ac_cv_header_ssl_h = yes ; then
+               AC_CHECK_LIB(ssl, SSLeay_add_ssl_algorithms, 
+                       [have_ssleay=yes
+                       need_rsaref=no],
+                       [have_ssleay=no],
+                       [-lcrypto])
+                       
+               if test $have_ssleay = no ; then
+                       AC_CHECK_LIB(ssl, ssl3_accept, 
+                               [have_ssleay=yes
+                               need_rsaref=yes], [have_ssleay=no],
+                               [-lcrypto -lRSAglue -lrsaref])
+               fi
+
+               if test $have_ssleay = yes ; then
+                       ol_with_tls=found
+                       ol_link_tls=yes
+
+                       AC_DEFINE(HAVE_SSLEAY, 1, 
+                               [define if you have SSLeay or OpenSSL])
+
+                       if test $need_rsaref = yes; then
+                               AC_DEFINE(HAVE_RSAREF, 1, 
+                                       [define if you have RSAref])
+
+                               TLS_LIBS="-lssl -lcrypto -lRSAglue -lrsaref"
+                       else
+                               TLS_LIBS="-lssl -lcrypto"
+                       fi
+               fi
+       fi
+fi
+
+if test $ol_link_tls = yes ; then
+       AC_DEFINE(HAVE_TLS, 1, [define if you have TLS])
+fi     
+
+dnl Tests for reentrant functions necessary to build a
+dnl thread_safe -lldap.
+AC_CHECK_FUNCS(                \
+       ctime_r                 \
+       gethostbyname_r gethostbyaddr_r \
+)
+
+if test "$ac_cv_func_ctime_r" = no ; then
+       ol_cv_func_ctime_r_nargs=0
+else
+       OL_FUNC_CTIME_R_NARGS
+dnl    OL_FUNC_CTIME_R_TYPE
+fi
+
+if test "$ac_cv_func_gethostbyname_r" = yes ; then
+       OL_FUNC_GETHOSTBYNAME_R_NARGS
+else
+       ol_cv_func_gethostbyname_r_nargs=0
+fi
+if test "$ac_cv_func_gethostbyaddr_r" = yes ; then
+       OL_FUNC_GETHOSTBYADDR_R_NARGS
+else
+       ol_cv_func_gethostbyaddr_r_nargs=0
+fi
+
+if test "$ac_cv_func_ctime_r" = yes \
+       -a "$ol_cv_func_ctime_r_nargs" -ge 2 \
+       -a "$ol_cv_func_ctime_r_nargs" -le 3 \
+       -a "$ac_cv_func_gethostbyname_r" = yes \
+       -a "$ol_cv_func_gethostbyname_r_nargs" -ge 5 \
+       -a "$ol_cv_func_gethostbyname_r_nargs" -le 6 \
+       -a "$ac_cv_func_gethostbyaddr_r" = yes \
+       -a "$ol_cv_func_gethostbyaddr_r_nargs" -ge 5 \
+       -a "$ol_cv_func_gethostbyaddr_r_nargs" -le 6 \
+       ; then
+       AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_REENTRANT,1)
+fi
+
 ol_link_threads=no
 if test $ol_with_threads = auto -o $ol_with_threads = yes \
        -o $ol_with_threads = posix ; then
@@ -468,12 +646,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                # consider threads found
                ol_with_threads=found
 
-               OL_LINUX_THREADS
-
-               if test $ol_cv_linux_threads = yes ; then
-                       AC_DEFINE(HAVE_LINUX_THREADS,1,
-                               [define if you have LinuxThreads])
-               fi
+               OL_HEADER_LINUX_THREADS
 
                dnl Now the hard part, how to link?
                dnl
@@ -483,284 +656,120 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                dnl     pthread_create() in $LIBS
                dnl
                dnl Check special pthread (final) flags
+               dnl     pthread_create() with -mt (Solaris)
                dnl     pthread_create() with -kthread (FreeBSD)
-               dnl     pthread_create() with -pthread (FreeBSD)
-               dnl     pthread_create() with -pthreads (OSF/1)
+               dnl     pthread_create() with -pthread (FreeBSD/Digital Unix)
+               dnl     pthread_create() with -pthreads (?)
                dnl     pthread_create() with -thread (?)
                dnl
                dnl Check pthread (final) libraries
                dnl     pthread_mutex_unlock() in -lpthread -lmach -lexc -lc_r (OSF/1)
                dnl     pthread_mutex_lock() in -lpthread -lmach -lexc (OSF/1)
-               dnl     pthread_mutex_trylock() in -lpthread -lexc (OSF/1)
+               dnl     (skipped) pthread_mutex_trylock() in -lpthread -lexc (OSF/1)
+               dnl     pthread_join() -Wl,-woff,85 -lpthread (IRIX)
                dnl     pthread_create() in -lpthread (many)
                dnl     pthread_create() in -lc_r (FreeBSD)
-               dnl     pthread_create() in -lpthreads (many)
-               dnl     pthread_join() -Wl,-woff,85 -lpthreads (IRIX)
-               dnl     pthread_create() in HP-UX -lpthread (HP-UX 11)
                dnl
-               dnl Check pthread (draft4) flags (to be depreciated)
+               dnl Check pthread (draft4) flags (depreciated)
                dnl     pthread_create() with -threads (OSF/1)
                dnl
-               dnl Check pthread (final) libraries (to be depreciated)
+               dnl Check pthread (draft4) libraries (depreciated)
                dnl     pthread_mutex_unlock() in -lpthreads -lmach -lexc -lc_r (OSF/1)
                dnl     pthread_mutex_lock() in -lpthreads -lmach -lexc (OSF/1)
                dnl     pthread_mutex_trylock() in -lpthreads -lexc (OSF/1)
+               dnl     pthread_create() in -lpthreads (many)
                dnl
 
                dnl pthread_create in $LIBS
-               AC_CHECK_FUNC(pthread_create,[ol_link_threads=yes])
-
-               if test $ol_link_threads = no ; then
-                       dnl try -kthread
-                       AC_CACHE_CHECK([for pthread_create with -kthread],
-                               [ol_cv_kthread_flag], [
-                               dnl save the flags
-                               save_LIBS="$LIBS"
-                               LIBS="-kthread $LIBS"
-                               AC_TRY_LINK([char pthread();],[
-                                       pthread_create();
-                                       ], ol_cv_kthread_flag=yes, ol_cv_kthread_flag=no)
-                               dnl restore the LIBS
-                               LIBS="$save_LIBS"
-                       ])
-
-                       if test $ol_cv_kthread_flag = yes ; then
-                               LTHREAD_LIBS="$LTHREAD_LIBS -kthread"
-                               ol_link_threads=posix
-                       fi
-               fi
-
-               if test $ol_link_threads = no ; then
-                       dnl try -pthread
-                       AC_CACHE_CHECK([for pthread_create with -pthread],
-                               [ol_cv_pthread_flag], [
-                               dnl save the flags
-                               save_LIBS="$LIBS"
-                               LIBS="-pthread $LIBS"
-                               AC_TRY_LINK([char pthread();],[
-                                       pthread_create();
-                                       ], ol_cv_pthread_flag=yes, ol_cv_pthread_flag=no)
-                               dnl restore the LIBS
-                               LIBS="$save_LIBS"
-                       ])
-
-                       if test $ol_cv_pthread_flag = yes ; then
-                               LTHREAD_LIBS="$LTHREAD_LIBS -pthread"
-                               ol_link_threads=posix
-                       fi
-               fi
-
-               if test $ol_link_threads = no ; then
-                       dnl try -pthreads
-                       AC_CACHE_CHECK([for pthread_create with -pthreads],
-                               [ol_cv_pthreads_flag], [
-                               dnl save the flags
-                               save_LIBS="$LIBS"
-                               LIBS="-pthreads $LIBS"
-                               AC_TRY_LINK([char pthread();],[
-                                       pthread_create();
-                                       ], ol_cv_pthreads_flag=yes, ol_cv_pthreads_flag=no)
-                               dnl restore the LIBS
-                               LIBS="$save_LIBS"
-                       ])
-
-                       if test $ol_cv_pthreads_flag = yes ; then
-                               LTHREAD_LIBS="$LTHREAD_LIBS -pthreads"
-                               ol_link_threads=posix
-                       fi
-               fi
-
-               if test $ol_link_threads = no ; then
-                       dnl try -thread
-                       AC_CACHE_CHECK([for pthread_create with -thread],
-                               [ol_cv_thread_flag], [
-                               dnl save the flags
-                               save_LIBS="$LIBS"
-                               LIBS="-thread $LIBS"
-                               AC_TRY_LINK([char pthread();],[
-                                       pthread_create();
-                                       ], ol_cv_thread_flag=yes, ol_cv_thread_flag=no)
-                               dnl restore the LIBS
-                               LIBS="$save_LIBS"
-                       ])
-
-                       if test $ol_cv_thread_flag = yes ; then
-                               LTHREAD_LIBS="$LTHREAD_LIBS -thread"
-                               ol_link_threads=posix
-                       fi
-               fi
+               AC_MSG_CHECKING([for pthread_create in default libraries])
+               AC_CACHE_VAL(ol_cv_pthread_create,[
+               AC_TRY_RUN([
+#include <pthread.h>
+#ifndef NULL
+#define NULL (void*)0
+#endif
 
-               if test $ol_link_threads = no ; then
-                       dnl try DEC Threads -lpthread -lmach -lexc -lc_r
-                       save_LIBS="$LIBS"
-                       AC_CHECK_LIB(pthread, pthread_mutex_unlock, [
-                               ol_link_threads=posix
-                               LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc -lc_r"
-                               if test $ol_with_yielding_select = auto ; then
-                                       ol_with_yielding_select=yes
-                               fi
-                               ],:,[-lmach -lexc -lc_r])
-                       LIBS="$save_LIBS"
-               fi
+static void *task(p)
+       void *p;
+{
+       return (void *) (p == NULL);
+}
 
-               if test $ol_link_threads = no ; then
-                       dnl try DEC Threads -lpthread -lmach -lexc
-                       save_LIBS="$LIBS"
-                       AC_CHECK_LIB(pthread, pthread_mutex_lock, [
-                               ol_link_threads=posix
-                               LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc"
-                               if test $ol_with_yielding_select = auto ; then
-                                       ol_with_yielding_select=yes
-                               fi
-                               ],:,[-lmach -lexc])
-                       LIBS="$save_LIBS"
-               fi
+int main(argc, argv)
+       int argc;
+       char **argv;
+{
+       pthread_t t;
+       int status;
 
-               if test $ol_link_threads = no ; then
-                       dnl try DEC Threads -lpthread -lexc
-                       save_LIBS="$LIBS"
-                       AC_CHECK_LIB(pthread, pthread_mutex_trylock, [
-                               ol_link_threads=posix
-                               LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lexc"
-                               if test $ol_with_yielding_select = auto ; then
-                                       ol_with_yielding_select=yes
-                               fi
-                               ],:,[-lexc])
-                       LIBS="$save_LIBS"
-               fi
+       /* make sure pthread_create() isn't just a stub */
+#if HAVE_PTHREADS_D4
+       status = pthread_create(&t, pthread_attr_default, task, NULL);
+#else
+       status = pthread_create(&t, NULL, task, NULL);
+#endif
 
-               if test $ol_link_threads = no ; then
-                       dnl try -lpthread
-                       save_LIBS="$LIBS"
-                       AC_CHECK_LIB(pthread, pthread_create, [
-                               ol_link_threads=posix
-                               LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"],:)
-                       LIBS="$save_LIBS"
-               fi
+       if( status ) return status;
 
-               if test $ol_link_threads = no ; then
-                       dnl try -lc_r
-                       save_LIBS="$LIBS"
-                       AC_CHECK_LIB(c_r, pthread_create, [
-                               ol_link_threads=posix
-                               LTHREAD_LIBS="$LTHREAD_LIBS -lc_r"],:)
-                       LIBS="$save_LIBS"
-               fi
+       /* make sure pthread_detach() isn't just a stub */
+#if HAVE_PTHREADS_D4
+       status = pthread_detach( &t );
+#else
+       status = pthread_detach( t );
+#endif
 
-               if test $ol_link_threads = no ; then
-                       dnl try -lpthreads
-                       save_LIBS="$LIBS"
-                       AC_CHECK_LIB(pthreads, pthread_create, [
-                               ol_link_threads=posix
-                               LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"],:)
-                       LIBS="$save_LIBS"
-               fi
+       if( status ) return status;
 
-               dnl IRIX Pthread check
-               if test $ol_link_threads = no ; then
-                       dnl try IRIX Pthreads -Wl,-woff,85 -lpthreads
-                       save_LIBS="$LIBS"
-                       AC_CHECK_LIB(pthreads, pthread_join, [
-                               ol_link_threads=posix
-                               LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"
-                               ],:,[-Wl,-woff,85])
-                       LIBS="$save_LIBS"
+       return status;
+}
+],
+                       [ol_cv_pthread_create=yes],
+                       [ol_cv_pthread_create=no],
+                       [dnl assume yes
+                       ol_cv_pthread_create=yes])])
+               AC_MSG_RESULT($ol_cv_pthread_create)
+
+               if test $ol_cv_pthread_create != no ; then
+                       ol_link_threads=posix
+                       ol_link_pthreads=""
                fi
+               
+               OL_PTHREAD_TRY_LINK([-mt],              [ol_cv_pthread_mt])
+               OL_PTHREAD_TRY_LINK([-kthread], [ol_cv_pthread_kthread])
+               OL_PTHREAD_TRY_LINK([-pthread], [ol_cv_pthread_pthread])
+               OL_PTHREAD_TRY_LINK([-pthreads],[ol_cv_pthread_pthreads])
+               OL_PTHREAD_TRY_LINK([-thread],  [ol_cv_pthread_thread])
 
-               dnl HP-UX 11 Pthread check
-               if test $ol_link_threads = no; then
-                       save_LIBS="$LIBS"
-                       LIBS="$LIBS -lpthread"
-                       AC_MSG_CHECKING([for pthread_create() in HP-UX -lpthread])
-                       ol_try_pthread_hpux_11=no
-                       AC_CACHE_VAL(ol_cv_pthread_hpux_11,[
-                               AC_TRY_LINK([
-#include <pthread.h>
-#include <elf.h>
-#ifndef ELFABI_HPUX_REL11
-       die horribly
-#endif
-                               ], [pthread_create(NULL, NULL, NULL, NULL);],
-                                       ol_try_pthread_hpux_11=yes
-                                       ol_cv_pthread_hpux_11=yes,
-                                       ol_cv_pthread_hpux_11=no)])
-                       AC_MSG_RESULT(yes)
-                       LIBS="$save_LIBS"
-
-                       if test $ol_cv_pthread_hpux_11=yes ; then
-                               ol_link_threads=posix
-                               LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"
-                               if test $ol_try_pthread_hpux_11=yes ; then
-                                       dnl Some tests below may fail, cause we aint including
-                                       dnl pthread.h. Force appropriate ones to yes
-                                       ac_cv_func_pthread_attr_init=yes
-                               fi
-                       fi
-               fi
+               OL_PTHREAD_TRY_LINK([-lpthread -lmach -lexc -lc_r],
+                       [ol_cv_pthread_lpthread_lmach_lexc_lc_r])
+               OL_PTHREAD_TRY_LINK([-lpthread -lmach -lexc],
+                       [ol_cv_pthread_lpthread_lmach_lexc])
+dnl            OL_PTHREAD_TRY_LINK([-lpthread -lexc],
+dnl                    [ol_cv_pthread_lpthread_lexc])
 
-               if test $ol_link_threads = no ; then
-                       dnl try -threads
-                       AC_CACHE_CHECK([for pthread_create with -threads],
-                               [ol_cv_thread_flag], [
-                               dnl save the flags
-                               save_LIBS="$LIBS"
-                               LIBS="-threads $LIBS"
-                               AC_TRY_LINK([char pthread();],[
-                                       pthread_create();
-                                       ], ol_cv_thread_flag=yes, ol_cv_thread_flag=no)
-                               dnl restore the LIBS
-                               LIBS="$save_LIBS"
-                       ])
+               OL_PTHREAD_TRY_LINK([-lpthread -Wl,-woff,85],
+                       [ol_cv_pthread_lib_lpthread_woff])
 
-                       if test $ol_cv_thread_flag = yes ; then
-                               LTHREAD_LIBS="$LTHREAD_LIBS -threads"
-                               ol_link_threads=posix
-                       fi
-               fi
+               OL_PTHREAD_TRY_LINK([-lpthread],[ol_cv_pthread_lpthread])
+               OL_PTHREAD_TRY_LINK([-lc_r],    [ol_cv_pthread_lc_r])
 
-               if test $ol_link_threads = no ; then
-                       dnl try DEC Threads -lpthreads -lmach -lexc -lc_r
-                       save_LIBS="$LIBS"
-                       AC_CHECK_LIB(pthreads, pthread_mutex_unlock, [
-                               ol_link_threads=posix
-                               LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lmach -lexc -lc_r"
-                               if test $ol_with_yielding_select = auto ; then
-                                       ol_with_yielding_select=yes
-                               fi
-                               ],:,[-lmach -lexc -lc_r])
-                       LIBS="$save_LIBS"
-               fi
+               OL_PTHREAD_TRY_LINK([-threads], [ol_cv_pthread_threads])
 
-               if test $ol_link_threads = no ; then
-                       dnl try DEC Threads -lpthreads -lmach -lexc
-                       save_LIBS="$LIBS"
-                       AC_CHECK_LIB(pthreads, pthread_mutex_lock, [
-                               ol_link_threads=posix
-                               LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lmach -lexc"
-                               if test $ol_with_yielding_select = auto ; then
-                                       ol_with_yielding_select=yes
-                               fi
-                               ],:,[-lmach -lexc])
-                       LIBS="$save_LIBS"
-               fi
+               OL_PTHREAD_TRY_LINK([-lpthreads -lmach -lexc -lc_r],
+                       [ol_cv_pthread_lpthreads_lmach_lexc_lc_r])
+               OL_PTHREAD_TRY_LINK([-lpthreads -lmach -lexc],
+                       [ol_cv_pthread_lpthreads_lmach_lexc])
+               OL_PTHREAD_TRY_LINK([-lpthreads -lexc],
+                       [ol_cv_pthread_lpthreads_lexc])
 
-               if test $ol_link_threads = no ; then
-                       dnl try DEC Threads -lpthreads -lexc
-                       save_LIBS="$LIBS"
-                       AC_CHECK_LIB(pthreads, pthread_mutex_trylock, [
-                               ol_link_threads=posix
-                               LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lexc"
-                               if test $ol_with_yielding_select = auto ; then
-                                       ol_with_yielding_select=yes
-                               fi
-                               ],:,[-lexc])
-                       LIBS="$save_LIBS"
-               fi
+               OL_PTHREAD_TRY_LINK([-lpthreads],       [ol_cv_pthread_lib_lpthreads])
 
                if test $ol_link_threads != no ; then
                        AC_DEFINE(HAVE_PTHREADS,1,
                                [define if you have POSIX Threads])
 
+                       LTHREAD_LIBS="$LTHREAD_LIBS $ol_link_pthreads"
+
                        dnl save flags
                        save_CPPFLAGS="$CPPFLAGS"
                        save_LIBS="$LIBS"
@@ -782,7 +791,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                        fi
                        if test $ac_cv_func_sched_yield = no -a \
                                $ac_cv_func_pthread_yield = no ; then
-                               dnl Solaris has sched_yield() in -lposix4
+                               dnl Solaris has sched_yield() stub in -lposix4
                                dnl but we'll use thr_yield instead.
                                AC_CHECK_FUNCS(thr_yield)
                        fi
@@ -793,12 +802,31 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                        fi
 
                        dnl Check functions for compatibility
-                       AC_CHECK_FUNCS(pthread_kill pthread_detach)
+                       AC_CHECK_FUNCS(pthread_kill)
+
+                       dnl Check for pthread_detach with <pthread.h> inclusion
+                       dnl as it's symbol may have been mangled.
+                       AC_CACHE_CHECK([for pthread_detach with <pthread.h>],
+                               [ol_cv_func_pthread_detach], [
+                               dnl save the flags
+                               AC_TRY_LINK([
+#include <pthread.h>
+#ifndef NULL
+#define NULL (void*)0
+#endif
+],
+                                       [pthread_detach(NULL);],
+                                       [ol_cv_func_pthread_detach=yes],
+                                       [ol_cv_func_pthread_detach=no])
+                       ])
 
-                       if test $ac_cv_func_pthread_detach = no ; then
+                       if test $ol_cv_func_pthread_detach = no ; then
                                AC_MSG_ERROR([could not locate pthread_detach()])
                        fi
 
+                       AC_DEFINE(HAVE_PTHREAD_DETACH,1,
+                               [define if you have pthread_detach function])
+
                        dnl Check for setconcurreny functions
                        AC_CHECK_FUNCS( \
                                pthread_setconcurrency \
@@ -807,6 +835,13 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                                thr_getconcurrency \
                        )
 
+                       OL_SYS_LINUX_THREADS
+                       OL_LINUX_THREADS
+
+                       if test $ol_cv_linux_threads = error; then
+                               AC_MSG_ERROR([LinuxThreads header/library mismatch]);
+                       fi
+
                        AC_MSG_CHECKING([if pthread_create() works])
                        AC_CACHE_VAL(ol_cv_pthread_create_works,[
                        AC_TRY_RUN([
@@ -826,7 +861,11 @@ int main(argc, argv)
        char **argv;
 {
        pthread_t t;
+#if HAVE_PTHREADS_D4
+       exit(pthread_create(&t, pthread_attr_default, task, NULL));
+#else
        exit(pthread_create(&t, NULL, task, NULL));
+#endif
 }
 ],
                                [ol_cv_pthread_create_works=yes],
@@ -836,7 +875,7 @@ int main(argc, argv)
                        AC_MSG_RESULT($ol_cv_pthread_create_works)
 
                        if test $ol_cv_pthread_create_works = no ; then
-                               AC_MSG_ERROR([pthread.h and pthread_create are not compatible])
+                               AC_MSG_ERROR([pthread_create is not usable, check environment settings])
                        fi
 
                        dnl Check if select causes an yield
@@ -900,7 +939,11 @@ int main(argc, argv)
 #endif
 #endif
 
+#if HAVE_PTHREADS_D4
+       pthread_create(&t, pthread_attr_default, task, NULL);
+#else
        pthread_create(&t, NULL, task, NULL);
+#endif
 
 #if HAVE_SCHED_YIELD
        sched_yield();  /* make sure task runs first */
@@ -1038,7 +1081,7 @@ if test $ol_with_threads = manual ; then
 
        AC_CHECK_HEADERS(pthread.h sched.h)
        AC_CHECK_FUNCS(sched_yield pthread_yield)
-       OL_LINUX_THREADS
+       OL_HEADER_LINUX_THREADS
 
        AC_CHECK_HEADERS(mach/cthreads.h)
        AC_CHECK_HEADERS(lwp/lwp.h)
@@ -1055,17 +1098,11 @@ if test $ol_link_threads != no ; then
        AC_DEFINE(THREADSAFE,1)
        AC_DEFINE(_THREADSAFE,1)
 
-       dnl this might cause the errno symbol to be
-       dnl replaced with a function to get a thread specific errno.
-       dnl check to see if everything needs to be compiled
-       dnl with the thread libraries
+       dnl The errno declaration may dependent upon _REENTRANT.
+       dnl If it does, we must link with thread support.
        AC_CACHE_CHECK([for thread specific errno],
                [ol_cv_errno_thread_specific], [
-               AC_TRY_LINK([
-#include <errno.h>
-                       ], [
-int x = errno;
-                       ],
+               AC_TRY_LINK([#include <errno.h>], [errno = 0;],
                        [ol_cv_errno_thread_specific=yes],
                        [ol_cv_errno_thread_specific=no])
        ])
@@ -1104,7 +1141,7 @@ dnl               #ifdef LDAP_R_COMPILE
 dnl            #       include LDAP_R_COMPILE
 dnl            #endif
 dnl
-dnl LDAP_R_COMIPLE is defined by libldap_r/Makefile.in
+dnl LDAP_R_COMPILE is defined by libldap_r/Makefile.in
 dnl specifically for compiling the threadsafe version of
 dnl    the ldap library (-lldap_r).
 dnl            
@@ -1117,7 +1154,6 @@ dnl       save_CPPFLAGS="$CPPFLAGS"
 dnl    save_LIBS="$LIBS"
 dnl    LIBS="$LTHREAD_LIBS $LIBS"
 dnl    AC_CHECK_FUNCS( \
-dnl            strtok_r \
 dnl            gmtime_r \
 dnl            gethostbyaddr_r gethostbyname_r \
 dnl            feof_unlocked unlocked_feof \
@@ -1128,8 +1164,6 @@ dnl       CPPFLAGS="$save_CPPFLAGS"
 dnl    LIBS="$save_LIBS"
 fi  
 
-dnl ----------------------------------------------------------------
-
 if test $ol_link_threads = no ; then
        if test $ol_with_threads = yes ; then
                AC_MSG_ERROR([no suitable thread support])
@@ -1145,6 +1179,12 @@ if test $ol_link_threads = no ; then
        LTHREAD_LIBS=""
 fi
 
+if test $ol_link_threads != no ; then
+       AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE,1)
+fi
+
+dnl ----------------------------------------------------------------
+
 ol_link_ldbm=no 
 if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db2 ; then
        OL_BERKELEY_DB2
@@ -1207,6 +1247,18 @@ if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then
        ol_with_ldbm_api=none
 fi
 
+if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = mdbm ; then
+       OL_MDBM
+
+       if test $ol_cv_mdbm = yes ; then
+               ol_link_ldbm=mdbm
+               ol_with_ldbm_api=mdbm
+               if test $ol_cv_lib_mdbm != yes ; then
+                       LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_mdbm"
+               fi
+       fi
+fi
+
 if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then
        OL_GDBM
 
@@ -1258,6 +1310,10 @@ if test $ol_enable_wrappers != no ; then
        if test $have_wrappers = yes ; then
                AC_DEFINE(HAVE_TCPD,1, [define if you have -lwrap])
                SLAPD_LIBS="$SLAPD_LIBS -lwrap"
+
+               dnl We add another check for -lnsl since some libwrap's
+               dnl need it, but it isn't always included from above
+               AC_CHECK_LIB(nsl, main)
        else
                AC_MSG_WARN(could not find -lwrap)
                if test $ol_enable_wrappers = yes ; then
@@ -1282,6 +1338,39 @@ if test $ol_enable_dmalloc != no ; then
        AC_CHECK_LIB(dmalloc, dmalloc_shutdown)
 fi
 
+if test $ol_enable_tcl != no ; then
+       AC_CHECK_HEADERS(tcl.h)
+
+       if test $ac_cv_header_tcl_h != yes ; then
+               have_tcl=no
+       else
+               AC_CHECK_LIB(tcl,main,
+                       [have_tcl=yes; SLAPD_LIBS="$SLAPD_LIBS -ltcl"],
+                       [have_tcl=no])
+
+               if test $have_tcl != yes; then
+                       AC_CHECK_LIB(tcl7.6,main,
+                               [have_tcl=yes; SLAPD_LIBS="$SLAPD_LIBS -ltcl7.6"],
+                               [have_tcl=no])
+               fi
+
+               if test $have_tcl != yes; then
+                       AC_CHECK_LIB(tcl8.0,main,
+                               [have_tcl=yes; SLAPD_LIBS="$SLAPD_LIBS -ltcl8.0"],
+                               [have_tcl=no])
+               fi
+       fi
+
+       if test $have_tcl != yes ; then
+               AC_MSG_WARN([could not find -ltcl])
+               if test $ol_enable_tcl = yes ; then
+                       AC_MSG_ERROR([could not find tcl, select appropriate options or disable])
+               fi
+
+               ol_enable_tcl=no
+       fi
+fi
+
 # ud needs termcap (should insert check here)
 ol_link_termcap=no
 AC_CHECK_HEADERS(termcap.h ncurses.h)
@@ -1309,6 +1398,34 @@ if test $ol_link_termcap = no ; then
        TERMCAP_LIBS=
 fi
 
+dnl
+dnl Check for GNU readline
+dnl
+ol_link_readline=no
+if test $ol_with_readline != no ; then
+       AC_CHECK_HEADERS(readline/readline.h readline/history.h)
+
+       if test $ac_cv_header_readline_readline_h = yes ; then
+               save_LIBS="$LIBS"
+               LIBS="$TERMCAP_LIBS $LIBS"
+               AC_CHECK_LIB(readline, readline, 
+                       [have_readline=yes], [have_readline=no])
+               LIBS="$save_LIBS"
+                       
+               if test $have_readline = yes ; then
+                       ol_with_readline=found
+                       ol_link_readline=yes
+
+                       READLINE_LIBS="-lreadline"
+               fi
+       fi
+fi
+
+if test $ol_link_readline = yes ; then
+       AC_DEFINE(HAVE_READLINE, 1, [define if you have -lreadline])
+fi
+
+
 # FreeBSD (and others) have crypt(3) in -lcrypt
 if test $ol_enable_crypt != no ; then
        AC_CHECK_FUNC(crypt, [have_crypt=yes], [
@@ -1344,10 +1461,10 @@ fi
 
 dnl ----------------------------------------------------------------
 dnl Checks for header files.
-AC_HEADER_STDC
+OL_HEADER_STDC
 
-if test $ac_cv_header_stdc != yes; then
-       AC_MSG_WARN([could not Standard C compliant headers])
+if test $ol_cv_header_stdc != yes; then
+       AC_MSG_WARN([could not locate Standard C compliant headers])
 fi
 
 AC_HEADER_DIRENT
@@ -1359,14 +1476,18 @@ if test $am_cv_sys_posix_termios = yes ; then
 fi
 
 AC_CHECK_HEADERS(      \
+       arpa/inet.h             \
        arpa/nameser.h  \
+       assert.h                \
        crypt.h                 \
        errno.h                 \
        fcntl.h                 \
        filio.h                 \
        getopt.h                \
+       grp.h                   \
        libutil.h               \
        limits.h                \
+       locale.h                \
        malloc.h                \
        memory.h                \
        regex.h                 \
@@ -1385,6 +1506,7 @@ AC_CHECK_HEADERS( \
        sys/ioctl.h             \
        sys/param.h             \
        sys/resource.h  \
+       sys/select.h    \
        sys/socket.h    \
        sys/syslog.h    \
        sys/time.h              \
@@ -1407,6 +1529,7 @@ AC_TYPE_SIZE_T
 AC_STRUCT_ST_BLKSIZE
 AC_HEADER_TIME
 AC_STRUCT_TM
+OL_STRUCT_PASSWD_PW_GECOS
 
 OL_C_UPPER_LOWER
 AC_C_CONST
@@ -1427,6 +1550,9 @@ AC_FUNC_MEMCMP
 dnl AM_FUNC_MKTIME dnl checks for sys/time.h and unistd.h
 AC_FUNC_STRFTIME
 dnl AM_FUNC_STRTOD
+
+dnl we should use vfork instead of fork in a number of places...
+dnl AC_FUNC_VFORK
 AC_FUNC_VPRINTF
 
 if test $ac_cv_func_vprintf = yes ; then
@@ -1436,64 +1562,45 @@ fi
 
 AC_CHECK_FUNCS(                \
        bcopy                   \
+       endgrent                \
+       endpwent                \
        flock                   \
        getdtablesize   \
+       getgrgid                \
        gethostname             \
+       getpass                 \
        getpwuid                \
        gettimeofday    \
+       initgroups              \
        lockf                   \
        memcpy                  \
        memmove                 \
        mkstemp                 \
-       select                  \
+       recv                    \
+       recvfrom                \
        setpwfile               \
+       setgid                  \
+       setegid                 \
        setsid                  \
+       setuid                  \
+       seteuid                 \
        signal                  \
        sigset                  \
        snprintf                \
-       socket                  \
        strdup                  \
        strerror                \
        strpbrk                 \
        strrchr                 \
        strsep                  \
        strstr                  \
-       strtok                  \
        strtol                  \
        strtoul                 \
        strspn                  \
        sysconf                 \
        waitpid                 \
+       wait4                   \
 )
 
-# these functions are required to build a thread_safe -lldap
-AC_CHECK_FUNCS(                \
-       strtok_r                \
-       ctime_r                 \
-       gethostbyaddr_r \
-       gethostbyname_r \
-)
-
-if test "$ac_cv_func_ctime_r" = yes ; then
-       OL_FUNC_CTIME_R_NARGS
-else
-       ol_cv_func_ctime_r=0
-fi
-
-if test "$ac_cv_func_strtok_r" = yes \
-       -a "$ac_cv_func_ctime_r" = yes \
-       -a "$ol_cv_func_ctime_r_nargs" -ge 2 -a "$ol_cv_func_ctime_r_nargs" -le 3 \
-       -a "$ac_cv_func_gethostbyaddr_r" = yes \
-       -a "$ac_cv_func_gethostbyname_r" = yes \
-       ; then
-
-       AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_REENTRANT, 1)
-fi
-
-if test $ol_link_threads != no ; then
-       AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE, 1)
-fi
-
 dnl We actually may need to replace more than this.
 AC_REPLACE_FUNCS(getopt tempnam)
 
@@ -1545,12 +1652,23 @@ if test "$ol_enable_rlookups" != no ; then
        AC_DEFINE(SLAPD_RLOOKUPS,1)
 fi
 
+if test "$ol_link_modules" != no ; then
+       AC_DEFINE(SLAPD_MODULES,1)
+       BUILD_SLAPD=yes
+fi
+
 if test "$ol_link_bdb2" != no ; then
        AC_DEFINE(SLAPD_BDB2,1)
        BUILD_SLAPD=yes
        BUILD_BDB2=yes
 fi
 
+if test "$ol_link_ldap" != no ; then
+       AC_DEFINE(SLAPD_LDAP,1)
+       BUILD_SLAPD=yes
+       BUILD_LDAP=yes
+fi
+
 if test "$ol_link_ldbm" != no ; then
        AC_DEFINE(SLAPD_LDBM,1)
        BUILD_SLAPD=yes
@@ -1563,7 +1681,7 @@ if test "$ol_enable_passwd" != no ; then
        BUILD_PASSWD=yes
 fi
 
-if test "$ol_enable_perl" != no ; then
+if test "$ol_link_perl" != no ; then
        AC_DEFINE(SLAPD_PERL,1)
        BUILD_SLAPD=yes
        BUILD_PERL=yes
@@ -1575,6 +1693,12 @@ if test "$ol_enable_shell" != no ; then
        BUILD_SHELL=yes
 fi
 
+if test "$ol_enable_tcl" != no ; then
+       AC_DEFINE(SLAPD_TCL,1)
+       BUILD_SLAPD=yes
+       BUILD_TCL=yes
+fi
+
 if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \
        $BUILD_SLAPD = yes ; then
        BUILD_SLURPD=yes
@@ -1589,10 +1713,12 @@ dnl ----------------------------------------------------------------
 AC_SUBST(BUILD_LDAPD)
 AC_SUBST(BUILD_SLAPD)
   AC_SUBST(BUILD_BDB2)
+  AC_SUBST(BUILD_LDAP)
   AC_SUBST(BUILD_LDBM)
   AC_SUBST(BUILD_PASSWD)
   AC_SUBST(BUILD_PERL)
   AC_SUBST(BUILD_SHELL)
+  AC_SUBST(BUILD_TCL)
 AC_SUBST(BUILD_SLURPD)
 
 AC_SUBST(LDAP_LIBS)
@@ -1603,11 +1729,16 @@ AC_SUBST(LDBM_LIBS)
 AC_SUBST(LTHREAD_LIBS)
 AC_SUBST(LUTIL_LIBS)
 
+AC_SUBST(SLAPD_MODULES_CPPFLAGS)
+AC_SUBST(SLAPD_MODULES_LDFLAGS)
+
 AC_SUBST(SLAPD_PERL_CPPFLAGS)
 AC_SUBST(SLAPD_PERL_LDFLAGS)
 
 AC_SUBST(KRB_LIBS)
+AC_SUBST(READLINE_LIBS)
 AC_SUBST(TERMCAP_LIBS)
+AC_SUBST(TLS_LIBS)
 
 dnl ----------------------------------------------------------------
 dnl final output
@@ -1641,14 +1772,21 @@ libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/li
 servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk \
 servers/ldapd/Makefile:build/top.mk:servers/ldapd/Makefile.in:build/srv.mk \
 servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \
+servers/slapd/back-bdb2/Makefile:build/top.mk:servers/slapd/back-bdb2/Makefile.in:build/srv.mk \
+servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/srv.mk \
 servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/srv.mk \
 servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/srv.mk \
 servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/srv.mk \
 servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/srv.mk \
+servers/slapd/back-tcl/Makefile:build/top.mk:servers/slapd/back-tcl/Makefile.in:build/srv.mk \
 servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk \
 servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \
 servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \
-tests/Makefile:build/top.mk:tests/Makefile.in \
+tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk \
+tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk \
+contrib/Makefile:build/top.mk:contrib/Makefile.in:build/dir.mk \
+contrib/saucer/Makefile:build/top.mk:contrib/saucer/Makefile.in:build/rules.mk \
+contrib/web_ldap/Makefile:build/top.mk:contrib/web_ldap/Makefile.in:build/rules.mk \
 ,[
 date > stamp-h
 echo Please \"make depend\" to build dependencies