]> git.sur5r.net Git - openldap/blobdiff - configure.in
Generate OpenLDAP id for configure
[openldap] / configure.in
index 1d58306b8853c2bc2356d9fd17b661f4ba4e8900..3612401224a39670f85d926ace6c17cb1e9533a3 100644 (file)
@@ -1,11 +1,11 @@
-dnl
+dnl $OpenLDAP$
+
 dnl Copyright 1998,1999 The OpenLDAP Foundation.  All Rights Reserved.
 dnl 
 dnl Redistribution and use in source and binary forms are permitted only
 dnl as authorized by the OpenLDAP Public License.  A copy of this
 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
@@ -14,6 +14,7 @@ define([AC_CACHE_SAVE], )dnl
 dnl Configure.in for OpenLDAP
 AC_INIT(build/version)dnl
 AC_CONFIG_AUX_DIR(build)dnl
+OPENLDAP_ID=OL_RCS_ID(OpenLDAP)
 
 OL_VERSION=`cat $ac_aux_dir/version`
 if test -z "$OL_VERSION"; then
@@ -32,12 +33,13 @@ 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
+dnl aclocal.m4 should be built using aclocal from automake 1.4
+dnl libtool 1.3.3 should be installed.
 AC_PREREQ(2.13)dnl Required Autoconf version
 
-AC_CONFIG_HEADER(include/portable.h include/ldap_features.h)dnl
+AC_CONFIG_HEADER(include/portable.h include/ldap_features.h include/lber_types.h)dnl
 
-dnl
+dnl ----------------------------------------------------------------
 dnl Start Args
 AC_MSG_CHECKING(configure arguments)
 AC_PREFIX_DEFAULT(/usr/local)
@@ -45,16 +47,22 @@ 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"
+ldap_subdir="/openldap"
 
-AC_ARG_WITH(subdir, [  --with-subdir=DIR change default subdirectory used for installs], [
-       if test "$withval" = "no"; then
-               ldap_subdir=""
-       elif test "$withval" != "yes"; then
+AC_ARG_WITH(subdir,
+[  --with-subdir=DIR change default subdirectory used for installs],
+[case "$withval" in
+       no) ldap_subdir=""
+               ;;
+       yes)
+               ;;
+       /*|\\*)
                ldap_subdir="$withval"
-       fi
+               ;;
+       *)
+               ldap_subdir="/$withval"
+               ;;
+esac
 ])dnl
 
 AC_SUBST(ldap_subdir)dnl
@@ -64,7 +72,7 @@ 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
+OL_ARG_ENABLE(dns,[  --enable-dns              enable V2 DX Referrals extension], no)dnl
 OL_ARG_ENABLE(referrals,[  --enable-referrals  enable V2 Referrals extension], yes)dnl
 OL_ARG_ENABLE(cldap,[  --enable-cldap  enable connectionless ldap], no)dnl
 OL_ARG_ENABLE(x_compile,[  --enable-x-compile  enable cross compiling],
@@ -73,13 +81,17 @@ OL_ARG_ENABLE(x_compile,[  --enable-x-compile       enable cross compiling],
 dnl General "with" options
 OL_ARG_ENABLE(dmalloc,[  --enable-dmalloc      enable debug malloc support], no)dnl
 
+OL_ARG_WITH(cyrus_sasl,[  --with-cyrus-sasl    with Cyrus SASL support],
+       auto, [auto yes no] )
+OL_ARG_WITH(fetch,[  --with-fetch              with fetch URL support],
+       auto, [auto yes no] )
 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],
+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 posix mach pth 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] )
@@ -87,42 +99,59 @@ OL_ARG_WITH(yielding_select,[  --with-yielding-select       with implicitly yielding s
 dnl Server options
 
 dnl LDAPD OPTIONS
-AC_ARG_WITH(xxldapdoptions,[LDAPD Options:])
+AC_ARG_WITH(xxldapdoptions,[LDAPD (X.500-to-LDAP Gateway) Options:])
 OL_ARG_ENABLE(ldapd,[  --enable-ldapd  enable building ldapd], no)dnl
 
 dnl SLAPD OPTIONS
-AC_ARG_WITH(xxslapdoptions,[SLAPD Options:])
+AC_ARG_WITH(xxslapdoptions,[SLAPD (Standalone LDAP Daemon) Options:])
 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(modules,[    --enable-modules    enable dynamic module support], no)dnl
+OL_ARG_ENABLE(multimaster,[    --enable-multimaster    enable multimaster replication], no)dnl
 OL_ARG_ENABLE(phonetic,[    --enable-phonetic  enable phonetic/soundex], no)dnl
+OL_ARG_ENABLE(quipu,[    --enable-quipu        build quipu migration tools], no)dnl
 OL_ARG_ENABLE(rlookups,[    --enable-rlookups  enable reverse lookups], auto)dnl
+OL_ARG_ENABLE(aci,[    --enable-aci    enable per-object ACIs], no)dnl
+OL_ARG_ENABLE(discreteaci,[    --enable-discreteaci    enable discrete rights in ACIs], no)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_WITH(bdb2_module,[      --with-bdb2-module      module type], static,
+       [static dynamic])
 OL_ARG_ENABLE(ldap,[    --enable-ldap  enable ldap backend], no)dnl
+OL_ARG_WITH(ldap_module,[      --with-ldap-module      module type], static,
+       [static dynamic])
 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 mdbm gdbm ndbm manual])
+OL_ARG_WITH(ldbm_module,[      --with-ldbm-module      module type], static,
+       [static dynamic])
 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_WITH(passwd_module,[      --with-passwd-module  module type], static,
+       [static dynamic])
 OL_ARG_ENABLE(perl,[    --enable-perl  enable perl backend], no)dnl
+OL_ARG_WITH(perl_module,[      --with-perl-module      module type], static,
+       [static dynamic])
 OL_ARG_ENABLE(shell,[    --enable-shell        enable shell backend], no)dnl
+OL_ARG_WITH(shell_module,[      --with-shell-module    module type], static,
+       [static dynamic])
 OL_ARG_ENABLE(tcl,[    --enable-tcl    enable tcl backend], no)dnl
+OL_ARG_WITH(tcl_module,[      --with-tcl-module        module type], static,
+       [static dynamic])
 
 dnl SLURPD OPTIONS
-AC_ARG_WITH(xxslurpdoptions,[SLURPD Options:])
+AC_ARG_WITH(xxslurpdoptions,[SLURPD (Replication Daemon) Options:])
 OL_ARG_ENABLE(slurpd,[  --enable-slurpd        enable building slurpd], auto)dnl
 
 AC_ARG_WITH(xxliboptions,[Library Generation & Linking Options])
-AM_ENABLE_STATIC
-dnl AM_DISABLE_SHARED
-AM_ENABLE_SHARED
+AC_ENABLE_STATIC
+dnl AC_DISABLE_SHARED
+AC_ENABLE_SHARED
 
 dnl General "enable" options
 # validate options
@@ -159,27 +188,57 @@ if test $ol_enable_slapd = no ; then
        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_multimaster = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable-multimaster argument])
+       fi
        if test $ol_enable_wrappers = yes ; then
                AC_MSG_WARN([slapd disabled, ignoring --enable-wrappers argument])
        fi
        if test $ol_enable_phonetic = yes ; then
                AC_MSG_WARN([slapd disabled, ignoring --enable-phonetic argument])
        fi
+       if test $ol_enable_quipu = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable-quipu argument])
+       fi
        if test $ol_enable_rlookups = yes ; then
                AC_MSG_WARN([slapd disabled, ignoring --enable-rlookups argument])
        fi
+       if test $ol_enable_aci = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable-aci argument])
+       fi
+       if test $ol_enable_discreteaci = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable-discreteaci argument])
+       fi
        if test $ol_with_ldbm_api != auto ; then
                AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-api argument])
        fi
        if test $ol_with_ldbm_type != auto ; then
                AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-type argument])
        fi
+       if test $ol_with_bdb2_module != static ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-bdb2-module argument])
+       fi
+       if test $ol_with_ldap_module != static ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-ldap-module argument])
+       fi
+       if test $ol_with_ldbm_module != static ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-module argument])
+       fi
+       if test $ol_with_passwd_module != static ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-passwd-module argument])
+       fi
+       if test $ol_with_perl_module != static ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-perl-module argument])
+       fi
+       if test $ol_with_shell_module != static ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-shell-module argument])
+       fi
+       if test $ol_with_tcl_module != static ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-tcl-module argument])
+       fi
        if test $ol_enable_slurpd = yes ; then
                AC_MSG_ERROR([slurpd requires slapd])
        fi
@@ -193,15 +252,26 @@ if test $ol_enable_slapd = no ; then
        ol_enable_shell=no
        ol_enable_tcl=no
 
-       ol_enable_aclgroups=no
        ol_enable_modules=no
+       ol_enable_multimaster=no
        ol_enable_phonetic=no
+       ol_enable_quipu=no
        ol_enable_rlookups=no
+       ol_enable_aci=no
+       ol_enable_discreteaci=no
        ol_enable_wrappers=no
 
        ol_with_ldbm_api=no
        ol_with_ldbm_type=no
 
+       ol_with_bdb2_module=static
+       ol_with_ldap_module=static
+       ol_with_ldbm_module=static
+       ol_with_passwd_module=static
+       ol_with_perl_module=static
+       ol_with_shell_module=static
+       ol_with_tcl_module=static
+
        ol_enable_slurpd=no
 
 elif test $ol_enable_ldbm = no ; then
@@ -215,6 +285,10 @@ elif test $ol_enable_ldbm = no ; then
                AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-type argument])
        fi
 
+       if test $ol_with_ldbm_module != static ; then
+               AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-module argument])
+       fi
+
        if test $ol_enable_bdb2 = yes ; then
                AC_MSG_ERROR([BDB2 requires --enable-ldbm])
        fi
@@ -230,6 +304,7 @@ elif test $ol_enable_ldbm = no ; then
 
        ol_with_ldbm_api=no
        ol_with_ldbm_type=no
+       ol_with_ldbm_module=static
 
 elif test $ol_enable_bdb2 = yes ; then
        dnl SLAPD with BDB2
@@ -277,6 +352,7 @@ AC_MSG_RESULT(done)
 
 ## Initialize vars
 LDAP_LIBS=
+LDIF_LIBS=
 LDBM_LIBS=
 LTHREAD_LIBS=
 LUTIL_LIBS=
@@ -294,26 +370,44 @@ BUILD_LDAP=no
 BUILD_LDBM=no
 BUILD_PASSWD=no
 BUILD_PERL=no
+BUILD_QUIPU=no
 BUILD_SHELL=no
 BUILD_TCL=no
 BUILD_THREAD=no
 
+BUILD_BDB2_DYNAMIC=static
+BUILD_LDAP_DYNAMIC=static
+BUILD_LDBM_DYNAMIC=static
+BUILD_PASSWD_DYNAMIC=static
+BUILD_PERL_DYNAMIC=static
+BUILD_SHELL_DYNAMIC=static
+BUILD_TCL_DYNAMIC=static
+
 SLAPD_MODULES_LDFLAGS=
 SLAPD_MODULES_CPPFLAGS=
+SLAPD_MODULES_LIST=
 
 SLAPD_PERL_LDFLAGS=
 SLAPD_PERL_CPPFLAGS=
 
 KRB_LIBS=
 READLINE_LIBS=
+SASL_LIBS=
 TERMCAP_LIBS=
 TLS_LIBS=
+MODULES_LIBS=
 
 dnl ----------------------------------------------------------------
 dnl Checks for programs
 
 dnl AC_PROG_INSTALL
 
+AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion])
+
+dnl
+dnl Determine which C translator to use
+dnl
+
 dnl AIX Thread requires we use cc_r or xlc_r.
 dnl But only do this IF AIX and CC is not set
 dnl and threads are auto|yes|posix.
@@ -326,7 +420,7 @@ dnl If we do not find cc_r|xlc_r, disable threads
 ol_aix_threads=no
 case "$target" in
 *-*-aix*) dnl all AIX is not a good idea.
-       if test -z "CC" ; then
+       if test -z "$CC" ; then
                case "$ol_with_threads" in
                auto | yes |  posix) ol_aix_threads=yes ;;
                esac
@@ -363,7 +457,8 @@ dnl The default CFLAGS is empty NOT whatever AC_PROG_CC sets.
 dnl (for now, let autoconf sort this out)
 dnl CFLAGS=${CFLAGS-""}
 
-AM_PROG_LIBTOOL
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
 dnl AC_PROG_MAKE_SET
 
 AC_PROG_AWK
@@ -379,25 +474,6 @@ AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail,
 AC_PATH_PROG(EDITOR, vi, /usr/ucb/vi, $PATH:/usr/ucb)
 AC_PATH_PROG(FINGER, finger, /usr/ucb/finger, $PATH:/usr/ucb)
 
-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)
@@ -435,9 +511,6 @@ 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
@@ -446,14 +519,15 @@ AC_OBJEXT
 
 AC_DEFINE_UNQUOTED( EXEEXT, "${EXEEXT}", [defined to be the EXE extension])
 
+dnl BeOS requires -lbe -lroot -lnet
+AC_CHECK_LIB(be, be_app, [LIBS="$LIBS -lbe -lroot -lnet"], :, [-lroot -lnet])
+
 dnl OpenLDAP requires STDC features
 AM_PROG_CC_STDC
 if test "X${am_cv_prog_cc_stdc}" = "Xno" ; then
-       AC_MSG_ERROR([OpenLDAP requires compiler to support STDC prototypes.])
+       AC_MSG_ERROR([OpenLDAP requires compiler to support STDC constructs.])
 fi
 
-dnl AM_C_PROTOTYPES
-
 dnl Check cc depend flags
 OL_MKDEPEND
 if test "${ol_cv_mkdep}" = no ; then
@@ -461,6 +535,91 @@ if test "${ol_cv_mkdep}" = no ; then
        AC_MSG_WARN([do not know how to generate dependencies])
 fi
 
+dnl
+dnl Check for module support
+dnl
+ol_link_modules=no
+if test $ol_enable_modules != no ; then
+       AC_CHECK_HEADERS(ltdl.h)
+
+       if test $ac_cv_header_ltdl_h = no ; then
+               AC_MSG_ERROR([could not locate libtool ltdl.h])
+
+       fi
+
+       AC_CHECK_LIB(ltdl, lt_dlinit)
+       if test "$ac_cv_lib_ltdl_lt_dlinit" = no ; then
+               AC_MSG_ERROR([could not locate libtool -lltdl])
+       fi
+       ol_link_modules=yes
+else
+       ol_with_bdb2_module=static
+       ol_with_ldap_module=static
+       ol_with_ldbm_module=static
+       ol_with_passwd_module=static
+       ol_with_perl_module=static
+       ol_with_shell_module=static
+       ol_with_tcl_module=static
+fi
+
+dnl ----------------------------------------------------------------
+dnl Checks for header files.
+OL_HEADER_STDC
+
+if test $ol_cv_header_stdc != yes; then
+       AC_MSG_WARN([could not locate Standard C compliant headers])
+fi
+
+AC_HEADER_DIRENT
+AC_HEADER_SYS_WAIT
+AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
+if test $am_cv_sys_posix_termios = yes ; then
+       AC_DEFINE(HAVE_POSIX_TERMIOS,1,
+               [define if you have POSIX termios])
+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                \
+       netinet/tcp.h   \
+       malloc.h                \
+       memory.h                \
+       psap.h                  \
+       pwd.h                   \
+       resolv.h                \
+       sgtty.h                 \
+       shadow.h                \
+       stddef.h                \
+       string.h                \
+       strings.h               \
+       sysexits.h              \
+       sys/file.h              \
+       sys/filio.h             \
+       sys/errno.h             \
+       sys/ioctl.h             \
+       sys/param.h             \
+       sys/resource.h  \
+       sys/select.h    \
+       sys/socket.h    \
+       sys/syslog.h    \
+       sys/time.h              \
+       sys/types.h             \
+       syslog.h                \
+       termios.h               \
+       unistd.h                \
+)
+
+dnl ----------------------------------------------------------------
 dnl Checks for libraries
 
 dnl Find socket()
@@ -469,9 +628,7 @@ dnl         -lsocket [ -lnsl_s | -lnsl ]
 dnl            -linet
 
 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)
@@ -481,23 +638,19 @@ dnl
        AC_CHECK_LIB(gen, main)
 ])
 
-dnl Check for resolver routines
-AC_CHECK_FUNCS(res_search)
-if test $ac_cv_func_res_search = "no" ; then 
-       AC_CHECK_LIB(bind, res_search)
-       if test "$ac_cv_lib_bind_res_search" = "yes" ; then
-               AC_DEFINE(HAVE_RES_SEARCH,1)
-       else
-               AC_CHECK_LIB(resolv, res_search)
-               if test "$ac_cv_lib_resolv_res_search" = "yes" ; then
-                       AC_DEFINE(HAVE_RES_SEARCH,1)
-               fi
-       fi
-fi
+dnl require select
+AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.]))
+dnl AC_CHECK_FUNCS(socketpair)
 
-dnl HP-UX requires -lV3
-AC_CHECK_LIB(V3, sigset)
+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
 
+dnl check to see if system call automatically restart
+dnl AC_SYS_RESTARTABLE_SYSCALLS
+
+dnl require POSIX regex
 AC_CHECK_HEADERS( regex.h )
 if test "$ac_cv_header_regex_h" != yes ; then
        AC_MSG_ERROR([POSIX regex.h required.])
@@ -509,12 +662,35 @@ if test "$ol_cv_c_posix_regex" = no ; then
        AC_MSG_ERROR([broken POSIX regex!])
 fi
 
-AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.]))
+dnl HP-UX requires -lV3
+AC_CHECK_LIB(V3, sigset)
+
+dnl Check for resolver routines
+AC_CHECK_FUNC(res_search,:)
+if test $ac_cv_func_res_search = no ; then 
+       AC_CHECK_LIB(bind, res_search)
+       ac_cv_func_res_search=$ac_cv_lib_bind_res_search
+fi
+
+if test $ac_cv_func_res_search = no ; then 
+       AC_CHECK_LIB(bind, __res_search)
+       ac_cv_func_res_search=$ac_cv_lib_bind___res_search
+fi
+
+if test $ac_cv_func_res_search = no ; then 
+       AC_CHECK_LIB(resolv, res_search)
+       ac_cv_func_res_search=$ac_cv_lib_resolv_res_search
+fi
+
+if test "$ac_cv_func_res_search" = yes ; then
+       AC_DEFINE(HAVE_RES_SEARCH,1,
+               [define if you have res_search()])
+elif test $ol_enable_dns = yes ; then
+       AC_MSG_ERROR([--enable-dns requires res_search])
+elif test $ol_enable_dns != no ; then
+       AC_MSG_WARN([no res_search, disabling DNS support])
+fi
 
-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
@@ -548,6 +724,18 @@ if test $ol_link_isode != no; then
        AC_PATH_PROG(PEPSY, pepsy)
 fi
 
+if test $ol_enable_quipu != no ; then
+       AC_CHECK_HEADERS(quipu/commonarg.h)
+
+       if test $ac_cv_header_quipu_commonarg_h = yes ; then
+               BUILD_QUIPU=yes
+       elif test $ol_enable_quipu = auto ; then
+               AC_MSG_WARN([no quipu for --enable-quipu=auto, disabling])
+       else
+               AC_MSG_ERROR(no quipu for --enable-quipu=$ol_enable_quipu)
+       fi
+fi
+
 dnl
 dnl check for kerberos
 dnl
@@ -619,15 +807,22 @@ dnl
 ol_link_tls=no
 if test $ol_with_tls != no ; then
        
-       AC_CHECK_HEADERS(ssl.h)
+       AC_CHECK_HEADERS(openssl/ssl.h ssl.h)
        
-       if test $ac_cv_header_ssl_h = yes ; then
+       if test $ac_cv_header_openssl_ssl_h = yes -o $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, SSL_library_init,
+                               [have_ssleay=yes
+                               need_rsaref=no], [have_ssleay=no],
+                               [-lcrypto])
+               fi
+
                if test $have_ssleay = no ; then
                        AC_CHECK_LIB(ssl, ssl3_accept, 
                                [have_ssleay=yes
@@ -702,7 +897,7 @@ ol_link_threads=no
 if test $ol_with_threads = auto -o $ol_with_threads = yes \
        -o $ol_with_threads = posix ; then
 
-       AC_CHECK_HEADERS(pthread.h sched.h)
+       AC_CHECK_HEADERS(pthread.h)
 
        if test $ac_cv_header_pthread_h = yes ; then
                OL_POSIX_THREAD_VERSION
@@ -721,6 +916,11 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                ol_with_threads=found
 
                OL_HEADER_LINUX_THREADS
+               OL_HEADER_GNU_PTH_PTHREAD_H
+
+               if test $ol_cv_header_gnu_pth_pthread_h = no ; then
+                       AC_CHECK_HEADERS(sched.h)
+               fi
 
                dnl Now the hard part, how to link?
                dnl
@@ -730,16 +930,17 @@ 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     [skipped] pthread_create() with -mt (Solaris) [disabled]
                dnl     pthread_create() with -kthread (FreeBSD)
                dnl     pthread_create() with -pthread (FreeBSD/Digital Unix)
                dnl     pthread_create() with -pthreads (?)
+               dnl     pthread_create() with -mthreads (AIX)
                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     (skipped) 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)
@@ -755,88 +956,50 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                dnl
 
                dnl pthread_create in $LIBS
-               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
-
-static void *task(p)
-       void *p;
-{
-       return (void *) (p == NULL);
-}
-
-int main(argc, argv)
-       int argc;
-       char **argv;
-{
-       pthread_t t;
-       int status;
-
-       /* 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( status ) return status;
-
-       /* make sure pthread_detach() isn't just a stub */
-#if HAVE_PTHREADS_D4
-       status = pthread_detach( &t );
-#else
-       status = pthread_detach( t );
-#endif
-
-       if( status ) return status;
-
-       return status;
-}
-],
+               AC_CACHE_CHECK([for pthread_create in default libraries],
+                       ol_cv_pthread_create,[
+               AC_TRY_RUN(OL_PTHREAD_TEST_PROGRAM,
                        [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)
+                       [AC_TRY_LINK(OL_PTHREAD_TEST_INCLUDES,OL_PTHREAD_TEST_FUNCTION,
+                               [ol_cv_pthread_create=yes],
+                               [ol_cv_pthread_create=no])])])
 
                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])
-
-               OL_PTHREAD_TRY_LINK([-lpthread -lmach -lexc -lc_r],
+dnl            OL_PTHREAD_TRY([-mt],           [ol_cv_pthread_mt])
+               OL_PTHREAD_TRY([-kthread],      [ol_cv_pthread_kthread])
+               OL_PTHREAD_TRY([-pthread],      [ol_cv_pthread_pthread])
+               OL_PTHREAD_TRY([-pthreads],     [ol_cv_pthread_pthreads])
+               OL_PTHREAD_TRY([-mthreads],     [ol_cv_pthread_mthreads])
+               OL_PTHREAD_TRY([-thread],       [ol_cv_pthread_thread])
+
+               OL_PTHREAD_TRY([-lpthread -lmach -lexc -lc_r],
                        [ol_cv_pthread_lpthread_lmach_lexc_lc_r])
-               OL_PTHREAD_TRY_LINK([-lpthread -lmach -lexc],
+               OL_PTHREAD_TRY([-lpthread -lmach -lexc],
                        [ol_cv_pthread_lpthread_lmach_lexc])
-dnl            OL_PTHREAD_TRY_LINK([-lpthread -lexc],
+dnl            OL_PTHREAD_TRY([-lpthread -lexc],
 dnl                    [ol_cv_pthread_lpthread_lexc])
 
-               OL_PTHREAD_TRY_LINK([-lpthread -Wl,-woff,85],
+               OL_PTHREAD_TRY([-lpthread -Wl,-woff,85],
                        [ol_cv_pthread_lib_lpthread_woff])
 
-               OL_PTHREAD_TRY_LINK([-lpthread],[ol_cv_pthread_lpthread])
-               OL_PTHREAD_TRY_LINK([-lc_r],    [ol_cv_pthread_lc_r])
+               OL_PTHREAD_TRY([-lpthread],     [ol_cv_pthread_lpthread])
+               OL_PTHREAD_TRY([-lc_r],         [ol_cv_pthread_lc_r])
 
-               OL_PTHREAD_TRY_LINK([-threads], [ol_cv_pthread_threads])
+               OL_PTHREAD_TRY([-threads],      [ol_cv_pthread_threads])
 
-               OL_PTHREAD_TRY_LINK([-lpthreads -lmach -lexc -lc_r],
+               OL_PTHREAD_TRY([-lpthreads -lmach -lexc -lc_r],
                        [ol_cv_pthread_lpthreads_lmach_lexc_lc_r])
-               OL_PTHREAD_TRY_LINK([-lpthreads -lmach -lexc],
+               OL_PTHREAD_TRY([-lpthreads -lmach -lexc],
                        [ol_cv_pthread_lpthreads_lmach_lexc])
-               OL_PTHREAD_TRY_LINK([-lpthreads -lexc],
+               OL_PTHREAD_TRY([-lpthreads -lexc],
                        [ol_cv_pthread_lpthreads_lexc])
 
-               OL_PTHREAD_TRY_LINK([-lpthreads],       [ol_cv_pthread_lib_lpthreads])
+               OL_PTHREAD_TRY([-lpthreads],[ol_cv_pthread_lib_lpthreads])
 
                if test $ol_link_threads != no ; then
                        AC_DEFINE(HAVE_PTHREADS,1,
@@ -859,7 +1022,8 @@ dnl                        [ol_cv_pthread_lpthread_lexc])
                                dnl Digital UNIX has sched_yield() in -lrt
                                AC_CHECK_LIB(rt, sched_yield,
                                        [LTHREAD_LIBS="$LTHREAD_LIBS -lrt"
-                                       AC_DEFINE(HAVE_SCHED_YIELD,1)
+                                       AC_DEFINE(HAVE_SCHED_YIELD,1,
+                                               [Define if you have the sched_yield function.])
                                        ac_cv_func_sched_yield=yes],
                                        [ac_cv_func_sched_yield=no])
                        fi
@@ -916,37 +1080,13 @@ dnl                      [ol_cv_pthread_lpthread_lexc])
                                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([
-#include <pthread.h>
-#ifndef NULL
-#define NULL (void*)0
-#endif
-
-static void *task(p)
-       void *p;
-{
-       return (void *) (p == NULL);
-}
-
-int main(argc, argv)
-       int argc;
-       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
-}
-],
+                       AC_CACHE_CHECK([if pthread_create() works],
+                               ol_cv_pthread_create_works,[
+                       AC_TRY_RUN(OL_PTHREAD_TEST_PROGRAM,
                                [ol_cv_pthread_create_works=yes],
                                [ol_cv_pthread_create_works=no],
                                [dnl assume yes
                                ol_cv_pthread_create_works=yes])])
-                       AC_MSG_RESULT($ol_cv_pthread_create_works)
 
                        if test $ol_cv_pthread_create_works = no ; then
                                AC_MSG_ERROR([pthread_create is not usable, check environment settings])
@@ -954,8 +1094,8 @@ int main(argc, argv)
 
                        dnl Check if select causes an yield
                        if test $ol_with_yielding_select = auto ; then
-                               AC_MSG_CHECKING([if select yields when using pthreads])
-                               AC_CACHE_VAL(ol_cv_pthread_select_yields,[
+                               AC_CACHE_CHECK([if select yields when using pthreads],
+                                       ol_cv_pthread_select_yields,[
                                AC_TRY_RUN([
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1030,9 +1170,12 @@ int main(argc, argv)
        exit(2);
 }],
                                [ol_cv_pthread_select_yields=no],
-                               [ol_cv_pthread_select_yields=yes], [
-                               AC_MSG_ERROR([crossing compiling: use --with-yielding_select=yes|no|manual])])])
-                               AC_MSG_RESULT($ol_cv_pthread_select_yields)
+                               [ol_cv_pthread_select_yields=yes],
+                               [ol_cv_pthread_select_yields=cross])])
+
+                               if test $ol_cv_pthread_select_yields = cross ; then
+                                       AC_MSG_ERROR([crossing compiling: use --with-yielding_select=yes|no|manual])
+                               fi
 
                                if test $ol_cv_pthread_select_yields = yes ; then
                                        ol_with_yielding_select=yes
@@ -1098,6 +1241,26 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
        fi
 fi
 
+if test $ol_with_threads = auto -o $ol_with_threads = yes \
+       -o $ol_with_threads = pth ; then
+
+       AC_CHECK_HEADERS(pth.h)
+
+       if test $ac_cv_header_pth_h = yes ; then
+               AC_CHECK_LIB(pth, pth_version, [have_pth=yes], [have_pth=no])
+
+               if test $have_pth = yes ; then
+                       AC_DEFINE(HAVE_GNU_PTH,1,[if you have GNU Pth])
+                       LTHREAD_LIBS="$LTHREAD_LIBS -lpth"
+                       ol_link_threads=pth
+
+                       if test $ol_with_yielding_select = auto ; then
+                               ol_with_yielding_select=yes
+                       fi
+               fi
+       fi
+fi
+
 if test $ol_with_threads = auto -o $ol_with_threads = yes \
        -o $ol_with_threads = lwp ; then
 
@@ -1279,9 +1442,11 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db2 ; then
                ol_with_ldbm_api=db2
 
                if test $ol_with_ldbm_type = hash ; then
-                       AC_DEFINE(LDBM_USE_DBHASH,1)
+                       AC_DEFINE(LDBM_USE_DBHASH,1,
+                               [define this to use DBHASH w/ LDBM backend])
                else
-                       AC_DEFINE(LDBM_USE_DBBTREE,1)
+                       AC_DEFINE(LDBM_USE_DBBTREE,1,
+                               [define this to use DBBTREE w/ LDBM backend])
                fi
 
                dnl $ol_cv_lib_db2 should be yes or -ldb
@@ -1305,9 +1470,11 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db ; then
                ol_with_ldbm_api=db
 
                if test $ol_with_ldbm_type = hash ; then
-                       AC_DEFINE(LDBM_USE_DBHASH,1)
+                       AC_DEFINE(LDBM_USE_DBHASH,1,
+                               [define this to use DBHASH w/ LDBM backend])
                else
-                       AC_DEFINE(LDBM_USE_DBBTREE,1)
+                       AC_DEFINE(LDBM_USE_DBBTREE,1,
+                               [define this to use DBBTREE w/ LDBM backend])
                fi
 
                dnl $ol_cv_lib_db should be yes or -ldb
@@ -1483,6 +1650,47 @@ if test $ol_link_termcap = no ; then
        TERMCAP_LIBS=
 fi
 
+dnl
+dnl Check for fetch URL support
+dnl            should be extended to support other fetch URL APIs
+dnl
+ol_link_sasl=no
+if test $ol_with_cyrus_sasl != no ; then
+       AC_CHECK_HEADER(sasl.h)
+
+       if test $ac_cv_header_sasl_h = yes ; then
+               AC_CHECK_LIB(sasl, sasl_client_init,
+                       [have_cyrus_sasl=yes], [have_cyrus_sasl=no])
+
+               if test $have_cyrus_sasl != no ; then
+                       SASL_LIBS="-lsasl"
+                       AC_DEFINE(HAVE_CYRUS_SASL,1,[define if you have Cyrus SASL])
+                       ol_link_sasl=yes
+               fi
+       fi
+
+       if test $ol_link_sasl = no -a $ol_with_cyrus_sasl = yes ; then
+               AC_MSG_ERROR(no suitable API for --with-cyrus-sasl=$ol_with_cyrus_sasl)
+       fi
+fi
+
+dnl
+dnl Check for fetch URL support
+dnl            should be extended to support other fetch URL APIs
+dnl
+ol_link_fetch=no
+if test $ol_with_fetch != no ; then
+       OL_LIB_FETCH
+
+       if test $ol_cv_lib_fetch != no ; then
+               LDIF_LIBS="$LDIF_LIBS $ol_link_fetch"
+               ol_link_fetch=freebsd
+
+       elif test $ol_with_fetch != auto ; then
+               AC_MSG_ERROR(no suitable API for --with-fetch=$ol_with_fetch)
+       fi 
+fi
+
 dnl
 dnl Check for GNU readline
 dnl
@@ -1518,7 +1726,7 @@ if test $ol_enable_crypt != no ; then
                        have_crypt=yes], [have_crypt=no])])
 
        if test $have_crypt = yes ; then
-               AC_DEFINE(HAVE_CRYPT,1)
+               AC_DEFINE(HAVE_CRYPT,1, [define if crypt(3) is available])
        else
                AC_MSG_WARN(could not find crypt)
                if test $ol_enable_crypt = yes ; then
@@ -1540,66 +1748,11 @@ if test $ol_enable_proctitle != no ; then
                        LIBOBJS="$LIBOBJS setproctitle.o"])])
 
        if test $have_setproctitle = yes ; then
-               AC_DEFINE(HAVE_SETPROCTITLE,1)
+               AC_DEFINE(HAVE_SETPROCTITLE,1,
+                       [define if setproctitle(3) is available])
        fi
 fi
 
-dnl ----------------------------------------------------------------
-dnl Checks for header files.
-OL_HEADER_STDC
-
-if test $ol_cv_header_stdc != yes; then
-       AC_MSG_WARN([could not locate Standard C compliant headers])
-fi
-
-AC_HEADER_DIRENT
-AC_HEADER_SYS_WAIT
-AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
-if test $am_cv_sys_posix_termios = yes ; then
-       AC_DEFINE(HAVE_POSIX_TERMIOS,1,
-               [define if you have POSIX termios])
-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                \
-       psap.h                  \
-       pwd.h                   \
-       resolv.h                \
-       sgtty.h                 \
-       stdarg.h                \
-       stddef.h                \
-       string.h                \
-       strings.h               \
-       sysexits.h              \
-       sys/file.h              \
-       sys/filio.h             \
-       sys/errno.h             \
-       sys/ioctl.h             \
-       sys/param.h             \
-       sys/resource.h  \
-       sys/select.h    \
-       sys/socket.h    \
-       sys/syslog.h    \
-       sys/time.h              \
-       sys/types.h             \
-       syslog.h                \
-       termios.h               \
-       unistd.h                \
-)
-
 dnl ----------------------------------------------------------------
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_GETGROUPS dnl requires AC_TYPE_UID_T
@@ -1610,10 +1763,12 @@ AM_TYPE_PTRDIFF_T
 AC_TYPE_SIGNAL
 OL_TYPE_SIG_ATOMIC_T
 AC_TYPE_SIZE_T
+OL_TYPE_SOCKLEN_T
 AC_STRUCT_ST_BLKSIZE
 AC_HEADER_TIME
 AC_STRUCT_TM
 OL_STRUCT_PASSWD_PW_GECOS
+OL_STRUCT_PASSWD_PW_PASSWD
 
 OL_C_UPPER_LOWER
 AC_C_CONST
@@ -1621,6 +1776,11 @@ OL_C_VOLATILE
 
 if test $cross_compiling = yes ; then
        AC_DEFINE(CROSS_COMPILING, 1, [define if cross compiling])
+
+       AC_DEFINE(LBER_INT_T,long)
+       AC_DEFINE(LBER_TAG_T,long)
+       AC_DEFINE(LBER_SOCKET_T,int)
+
 else
        AC_C_BIGENDIAN
        AC_CHECK_SIZEOF(short) 
@@ -1629,9 +1789,19 @@ else
 
        if test "$ac_cv_sizeof_int" -lt 4 ; then
                AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.])
+
+               AC_DEFINE(LBER_INT_T,long)
+               AC_DEFINE(LBER_TAG_T,long)
+               AC_DEFINE(LBER_SOCKET_T,int)
+       else
+               AC_DEFINE(LBER_INT_T,int)
+               AC_DEFINE(LBER_TAG_T,long)
+               AC_DEFINE(LBER_SOCKET_T,int)
        fi
 fi
 
+AC_DEFINE(LBER_LEN_T,long)
+
 dnl ----------------------------------------------------------------
 dnl Checks for library functions.
 AC_FUNC_MEMCMP
@@ -1639,6 +1809,8 @@ dnl AM_FUNC_MKTIME dnl checks for sys/time.h and unistd.h
 AC_FUNC_STRFTIME
 dnl AM_FUNC_STRTOD
 
+OL_FUNC_INET_ATON
+
 dnl we should use vfork instead of fork in a number of places...
 dnl AC_FUNC_VFORK
 AC_FUNC_VPRINTF
@@ -1659,12 +1831,16 @@ AC_CHECK_FUNCS(         \
        gethostname             \
        getpass                 \
        getpwuid                \
+       getpwnam                \
+       getspnam                \
        gettimeofday    \
        initgroups              \
        lockf                   \
        memcpy                  \
        memmove                 \
        mkstemp                 \
+       pipe                    \
+       read                    \
        recv                    \
        recvfrom                \
        setpwfile               \
@@ -1673,6 +1849,7 @@ AC_CHECK_FUNCS(           \
        setsid                  \
        setuid                  \
        seteuid                 \
+       sigaction               \
        signal                  \
        sigset                  \
        snprintf                \
@@ -1688,6 +1865,9 @@ AC_CHECK_FUNCS(           \
        sysconf                 \
        waitpid                 \
        wait4                   \
+       write                   \
+       send                    \
+       sendto                  \
 )
 
 dnl We actually may need to replace more than this.
@@ -1701,91 +1881,153 @@ dnl ----------------------------------------------------------------
 dnl Sort out defines
 
 if test "$ol_enable_debug" != no ; then
-       AC_DEFINE(LDAP_DEBUG,1)
+       AC_DEFINE(LDAP_DEBUG,1,
+               [define this to add debugging code])
 fi
 if test "$ol_enable_syslog" = yes ; then
-       AC_DEFINE(LDAP_SYSLOG,1)
+       AC_DEFINE(LDAP_SYSLOG,1,
+               [define this to add syslog code])
 fi
 if test "$ol_enable_libui" = yes ; then
-       AC_DEFINE(LDAP_LIBUI,1)
+       AC_DEFINE(LDAP_LIBUI,1,
+               [define this for LDAP User Interface support])
 fi
 if test "$ol_enable_cache" = no ; then
-       AC_DEFINE(LDAP_NOCACHE,1)
+       AC_DEFINE(LDAP_NOCACHE,1,
+               [define this to remove -lldap cache support])
 fi
 if test "$ol_enable_dns" != no ; then
        AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_DNS,LDAP_VENDOR_VERSION)
 fi
 if test "$ol_enable_proctitle" != no ; then
-       AC_DEFINE(LDAP_PROCTITLE,1)
+       AC_DEFINE(LDAP_PROCTITLE,1,
+               [define this for LDAP process title support])
 fi
 if test "$ol_enable_referrals" != no ; then
        AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_VENDOR_VERSION)
 fi
 if test "$ol_enable_cldap" != no ; then
-       AC_DEFINE(LDAP_CONNECTIONLESS,1)
+       AC_DEFINE(LDAP_CONNECTIONLESS,1,[define to support CLDAP])
 fi
 
-if test "$ol_enable_aclgroups" != no ; then
-       AC_DEFINE(SLAPD_ACLGROUPS,1)
-fi
 if test "$ol_enable_crypt" != no ; then
-       AC_DEFINE(SLAPD_CRYPT,1)
+       AC_DEFINE(SLAPD_CRYPT,1,[define to support crypt(3) passwords])
 fi
 if test "$ol_enable_cleartext" != no ; then
-       AC_DEFINE(SLAPD_CLEARTEXT,1)
+       AC_DEFINE(SLAPD_CLEARTEXT,1,[define to support cleartext passwords])
+fi
+if test "$ol_enable_multimaster" != no ; then
+       AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication])
 fi
 if test "$ol_enable_phonetic" != no ; then
-       AC_DEFINE(SLAPD_PHONETIC,1)
+       AC_DEFINE(SLAPD_PHONETIC,1,[define to support phonetic])
 fi
 if test "$ol_enable_rlookups" != no ; then
-       AC_DEFINE(SLAPD_RLOOKUPS,1)
+       AC_DEFINE(SLAPD_RLOOKUPS,1,[define to support reverse lookups])
+fi
+if test "$ol_enable_aci" != no ; then
+       AC_DEFINE(SLAPD_ACI_ENABLED,1,[define to support per-object ACIs])
+fi
+if test "$ol_enable_discreteaci" != no ; then
+       AC_DEFINE(SLAPD_ACI_DISCRETE_RIGHTS,1,[define to support discrete rights in ACIs])
 fi
 
 if test "$ol_link_modules" != no ; then
-       AC_DEFINE(SLAPD_MODULES,1)
+       AC_DEFINE(SLAPD_MODULES,1,[define to support modules])
        BUILD_SLAPD=yes
+       MODULES_LIBS=-lltdl
+       SLAPD_MODULES_LDFLAGS="-dlopen self"
 fi
 
 if test "$ol_link_bdb2" != no ; then
-       AC_DEFINE(SLAPD_BDB2,1)
+       AC_DEFINE(SLAPD_BDB2,1,[define to support BDB2 backend])
        BUILD_SLAPD=yes
        BUILD_BDB2=yes
+       if test "$ol_with_bdb2_module" != static ; then
+               AC_DEFINE(SLAPD_BDB2_DYNAMIC,1,
+                       [define to support dynamic BDB2 backend])
+               BUILD_BDB2=mod
+               BUILD_BDB2_DYNAMIC=shared
+               SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-bdb2/back_bdb2.la"
+       fi
 fi
 
 if test "$ol_enable_ldap" != no ; then
-       AC_DEFINE(SLAPD_LDAP,1)
+       AC_DEFINE(SLAPD_LDAP,1,[define to support LDAP backend])
        BUILD_SLAPD=yes
        BUILD_LDAP=yes
+       if test "$ol_with_ldap_module" != static ; then
+               AC_DEFINE(SLAPD_LDAP_DYNAMIC,1,
+                       [define to support dynamic LDAP backend])
+               BUILD_LDAP=mod
+               BUILD_LDAP_DYNAMIC=shared
+               SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-ldap/back_ldap.la"
+       fi
 fi
 
 if test "$ol_link_ldbm" != no ; then
-       AC_DEFINE(SLAPD_LDBM,1)
+       AC_DEFINE(SLAPD_LDBM,1,[define to support LDBM backend])
        BUILD_SLAPD=yes
        BUILD_LDBM=yes
+       if test "$ol_with_ldbm_module" != static ; then
+               AC_DEFINE(SLAPD_LDBM_DYNAMIC,1,
+                       [define to support dynamic LDBM backend])
+               BUILD_LDBM=mod
+               BUILD_LDBM_DYNAMIC=shared
+               SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-ldbm/back_ldbm.la"
+       fi
 fi
 
 if test "$ol_enable_passwd" != no ; then
-       AC_DEFINE(SLAPD_PASSWD,1)
+       AC_DEFINE(SLAPD_PASSWD,1,[define to support PASSWD backend])
        BUILD_SLAPD=yes
        BUILD_PASSWD=yes
+       if test "$ol_with_passwd_module" != static ; then
+               AC_DEFINE(SLAPD_PASSWD_DYNAMIC,1,
+                       [define to support dynamic PASSWD backend])
+               BUILD_PASSWD=mod
+               BUILD_PASSWD_DYNAMIC=shared
+               SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-passwd/back_passwd.la"
+       fi
 fi
 
 if test "$ol_link_perl" != no ; then
-       AC_DEFINE(SLAPD_PERL,1)
+       AC_DEFINE(SLAPD_PERL,1,[define to support PERL backend])
        BUILD_SLAPD=yes
        BUILD_PERL=yes
+       if test "$ol_with_perl_module" != static ; then
+               AC_DEFINE(SLAPD_PERL_DYNAMIC,1,
+                       [define to support dynamic PERL backend])
+               BUILD_PERL=mod
+               BUILD_PERL_DYNAMIC=shared
+               SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-perl/back_perl.la"
+       fi
 fi
 
 if test "$ol_enable_shell" != no ; then
-       AC_DEFINE(SLAPD_SHELL,1)
+       AC_DEFINE(SLAPD_SHELL,1,[define to support SHELL backend])
        BUILD_SLAPD=yes
        BUILD_SHELL=yes
+       if test "$ol_with_shell_module" != static ; then
+               AC_DEFINE(SLAPD_SHELL_DYNAMIC,1,
+                       [define to support dynamic SHELL backend])
+               BUILD_SHELL=mod
+               BUILD_SHELL_DYNAMIC=shared
+               SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-shell/back_shell.la"
+       fi
 fi
 
 if test "$ol_enable_tcl" != no ; then
-       AC_DEFINE(SLAPD_TCL,1)
+       AC_DEFINE(SLAPD_TCL,1,[define to support TCL backend])
        BUILD_SLAPD=yes
        BUILD_TCL=yes
+       if test "$ol_with_tcl_module" != static; then
+               AC_DEFINE(SLAPD_TCL_DYNAMIC,1,
+                       [define to support dynamic TCL backend])
+               BUILD_TCL=mod
+               BUILD_TCL_DYNAMIC=shared
+               SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-tcl/back_tcl.la"
+       fi
 fi
 
 if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \
@@ -1806,12 +2048,21 @@ AC_SUBST(BUILD_SLAPD)
   AC_SUBST(BUILD_LDBM)
   AC_SUBST(BUILD_PASSWD)
   AC_SUBST(BUILD_PERL)
+  AC_SUBST(BUILD_QUIPU)
   AC_SUBST(BUILD_SHELL)
   AC_SUBST(BUILD_TCL)
+  AC_SUBST(BUILD_BDB2_DYNAMIC)
+  AC_SUBST(BUILD_LDAP_DYNAMIC)
+  AC_SUBST(BUILD_LDBM_DYNAMIC)
+  AC_SUBST(BUILD_PASSWD_DYNAMIC)
+  AC_SUBST(BUILD_PERL_DYNAMIC)
+  AC_SUBST(BUILD_SHELL_DYNAMIC)
+  AC_SUBST(BUILD_TCL_DYNAMIC)
 AC_SUBST(BUILD_SLURPD)
 
 AC_SUBST(LDAP_LIBS)
 AC_SUBST(LDAPD_LIBS)
+AC_SUBST(LDIF_LIBS)
 AC_SUBST(SLAPD_LIBS)
 AC_SUBST(SLURPD_LIBS)
 AC_SUBST(LDBM_LIBS)
@@ -1820,14 +2071,17 @@ AC_SUBST(LUTIL_LIBS)
 
 AC_SUBST(SLAPD_MODULES_CPPFLAGS)
 AC_SUBST(SLAPD_MODULES_LDFLAGS)
+AC_SUBST(SLAPD_MODULES_LIST)
 
 AC_SUBST(SLAPD_PERL_CPPFLAGS)
 AC_SUBST(SLAPD_PERL_LDFLAGS)
 
 AC_SUBST(KRB_LIBS)
 AC_SUBST(READLINE_LIBS)
+AC_SUBST(SASL_LIBS)
 AC_SUBST(TERMCAP_LIBS)
 AC_SUBST(TLS_LIBS)
+AC_SUBST(MODULES_LIBS)
 
 dnl ----------------------------------------------------------------
 dnl final output
@@ -1861,13 +2115,13 @@ 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/back-bdb2/Makefile:build/top.mk:servers/slapd/back-bdb2/Makefile.in:build/mod.mk \
+servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk \
+servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk \
+servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk \
+servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk \
+servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/mod.mk \
+servers/slapd/back-tcl/Makefile:build/top.mk:servers/slapd/back-tcl/Makefile.in:build/mod.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 \