]> git.sur5r.net Git - openldap/blobdiff - configure.in
Fixed GDBM bugs.
[openldap] / configure.in
index e17188132e08dfe87a0b1abf7ef74c55d7db0683..22156f587f8a138c1de3e8de69464c746f6276ba 100644 (file)
@@ -18,171 +18,177 @@ AC_CONFIG_AUX_DIR(build)
 AC_CONFIG_HEADER(include/portable.h)dnl
 dnl
 dnl Start Args
-AC_MSG_CHECKING(arguments)
+AC_MSG_CHECKING(configure arguments)
 AC_PREFIX_DEFAULT(/usr/local)
 
 dnl General "enable" options
-CF_ARG_OPTION(debug,[  --enable-debug  enable debugging (yes)],[
-       LDAP_DEBUG=no],[LDAP_DEBUG=yes],yes)dnl
-CF_ARG_OPTION(libui,[  --enable-libui  enable library user interface (yes)],[
-       LDAP_LIBUI=no],[LDAP_LIBUI=yes],yes)dnl
-CF_ARG_OPTION(cache,[  --enable-cache  enable caching (yes)],[
-       LDAP_CACHE=no],[LDAP_CACHE=yes],yes)dnl
-CF_ARG_OPTION(referrals,[  --enable-referrals  enable referrals (yes)],[
-       LDAP_REFERRALS=no],[LDAP_REFERRALS=yes],yes)dnl
-
-CF_ARG_OPTION(cldap,[  --enable-clapd  enable connectionless ldap (no)],[
-       LDAP_CLDAP=yes],[LDAP_CLDAP=no],no)dnl
+OL_ARG_ENABLE(debug,[  --enable-debug  enable debugging], yes)dnl
+#OL_ARG_ENABLE(syslog,[  --enable-syslog       enable syslog support], auto)dnl
+OL_ARG_ENABLE(libui,[  --enable-libui  enable library user interface], yes)dnl
+OL_ARG_ENABLE(cache,[  --enable-cache  enable caching], yes)dnl
+OL_ARG_ENABLE(dns,[  --enable-dns      enable dns support], auto)dnl
+OL_ARG_ENABLE(referrals,[  --enable-referrals  enable referrals], yes)dnl
+OL_ARG_ENABLE(cldap,[  --enable-clapd  enable connectionless ldap], no)dnl
 
 dnl General "with" options
-AC_ARG_WITH(kerberos,[  --with-kerberos        use Kerberos (no)],[
-       opt_kerberos=yes],[opt_kerberos=no])
-AC_ARG_WITH(kerberos-afs,[  --with-kerberos-afs        use AFS Kerberos (no)],[
-       opt_kerberos_afs=yes],[opt_kerberos_afs=no])
-AC_ARG_WITH(threads,[  --with-threads  use threads (yes)],[
-       opt_threads=yes],[opt_threads=no])
+OL_ARG_WITH(kerberos,[  --with-kerberos        use Kerberos],
+       auto, [auto k5 k4 afs yes no])
+OL_ARG_WITH(threads,[  --with-threads  use threads],
+       auto, [auto posix dce mach yes no] )
 
 dnl Server options
 
 dnl LDAPD OPTIONS
-CF_ARG_OPTION(ldapd,[  --enable-ldapd  enable building ldapd (no)],[
-       BUILD_LDAPD=yes],[BUILD_LDAPD=no],no)dnl
+OL_ARG_ENABLE(ldapd,[  --enable-ldapd  enable building ldapd], no)dnl
 
 dnl SLAPD OPTIONS
-CF_ARG_OPTION(slapd,[  --enable-slapd  enable building slapd (yes)],[
-       BUILD_SLAPD=no],[BUILD_SLAPD=yes],yes)dnl
-CF_ARG_OPTION(aclgroup,[    --enable-aclgroup  enable ACL group support (yes)],[
-       SLAPD_ACLGROUP=no],[SLAPD_ALCGROUP=yes],yes)dnl
-CF_ARG_OPTION(crypt,[    --enable-crypt        enable crypt(3) passwords (yes)],[
-       SLAPD_CRYPT=no],[SLAPD_CRYPT=yes],yes)dnl
-CF_ARG_OPTION(md5,[    --enable-md5    enable MD5 passwords (yes)],[
-       SLAPD_MD5=no],[SLAPD_MD5=yes],yes)dnl
-CF_ARG_OPTION(sha1,[    --enable-sha1  enable SHA1 passwords (yes)],[
-       SLAPD_SHA1=no],[SLAPD_SHA1=yes],yes)dnl
-CF_ARG_OPTION(wrappers,[    --enable-wrappers  enable tcp wrapper support (no)],[
-       SLAPD_TCP_WRAPPERS=yes],[LDAP_TCP_WRAPPERS=no],no)dnl
-CF_ARG_OPTION(phonetic,[    --enable-phonetic  enable phonetic/soundex  (no)],[
-       SLAPD_PHONETIC=yes],[SLAPD_PHONETIC=no],no)dnl
-CF_ARG_OPTION(rlookups,[    --enable-rlookups  enable reverse lookups (yes)],[
-       SLAPD_RLOOKUP=no],[SLAPD_RLOOKUP=yes],yes)dnl
+OL_ARG_ENABLE(slapd,[  --enable-slapd  enable building slapd], yes)dnl
+OL_ARG_ENABLE(aclgroup,[    --enable-aclgroup  enable ACL group support], auto)dnl
+OL_ARG_ENABLE(crypt,[    --enable-crypt        enable crypt(3) passwords], auto)dnl
+OL_ARG_ENABLE(md5,[    --enable-md5    enable MD5 passwords], auto)dnl
+OL_ARG_ENABLE(sha1,[    --enable-sha1  enable SHA1 passwords], auto)dnl
+OL_ARG_ENABLE(wrappers,[    --enable-wrappers  enable tcp wrapper 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
 
 dnl SLAPD Backend options
-CF_ARG_OPTION(ldbm,[    --enable-ldbm  enable ldbm backend (yes)],[
-       SLAPD_LDBM=no],[SLAPD_LDBM=yes],yes)dnl
-CF_ARG_OPTION(passwd,[    --enable-passwd      enable passwd backend (yes)],[
-       SLAPD_PASSWD=no],[SLAPD_PASSWD=yes],yes)dnl
-CF_ARG_OPTION(shell,[    --enable-shell        enable shell backend (yes)],[
-       SLAPD_SHELL=no],[SLAPD_SHELL=yes],yes)dnl
-
-AC_ARG_WITH(ndbm,[    --with-ndbm              use NDB for LDBM backend (any)],[
-       opt_ndbm=yes],[opt_ndbm=no])
-AC_ARG_WITH(gdbm,[    --with-gdbm              use GDBM for LDBM backend (any)],[
-       opt_gdbm=yes],[opt_gdbm=no])
-AC_ARG_WITH(dbhash,[    --with-dbhash  use Berkeley DB Hash for LDBM backend (any)],[
-       opt_dbhash=yes],[opt_dbhash=no])
-AC_ARG_WITH(dbbtree,[    --with-dbbtree        use Berkeley DB Btrees for LDBM backend (any)],[
-       opt_dbbtree=yes],[opt_dbbtree=no])
-AC_ARG_WITH(db2,[    --with-db2                use Berkeley DB2 API (any)],[
-       opt_db2=yes],[opt_db2=no])
+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])
+OL_ARG_WITH(ldbm_type,[      --with-ldbm-type  use LDBM type], auto,
+       [auto btree hash])
 
-dnl SLURPD OPTIONS
-CF_ARG_OPTION(slurpd,[  --enable-slurpd        enable building slurpd (yes)],[
-       BUILD_SLURPD=no],[BUILD_SLURPD=yes],yes)dnl
-
-AC_MSG_RESULT(done)
+OL_ARG_ENABLE(passwd,[    --enable-passwd      enable passwd backend], no)dnl
+OL_ARG_ENABLE(shell,[    --enable-shell        enable shell backend], no)dnl
 
-AC_MSG_CHECKING(LDBM preferences)
-ldbm_prefer=any
+dnl SLURPD OPTIONS
+OL_ARG_ENABLE(slurpd,[  --enable-slurpd        enable building slurpd], auto)dnl
 
-if test "$opt_ndbm" = yes ; then
-       ldbm_prefer=ndbm
-fi
-if test "$opt_gdbm" = yes ; then
-       ldbm_prefer=gdbm
-fi
-if test "$opt_dbhash" = yes ; then
-       ldbm_prefer=dbhash
-fi
-if test "$opt_dbbtree" = yes ; then
-       ldbm_prefer=dbbtree
-fi
-AC_MSG_RESULT($ldbm_prefer)
-
-if test "$BUILD_SLAPD" != "yes" ; then
-       BUILD_SLURPD="no"
-       SLAPD_LDBM="no"
-       SLAPD_PASSWD="no"
-       SLAPD_SHELL="no"
-       ldbm_prefer="none"
-fi
+if test $ol_enable_slapd = no ; then
+       dnl SLAPD was specificallly disabled
+       if test $ol_enable_ldbm = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable_ldbm argument]);
+       fi
+       if test $ol_enable_passwd = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable_passwd argument]);
+       fi
+       if test $ol_enable_shell = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable_shell argument]);
+       fi
+       if test $ol_enable_aclgroup = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable_aclgroup argument]);
+       fi
+       if test $ol_enable_crypt = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable_crypt argument]);
+       fi
+       if test $ol_enable_md5 = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable_md5 argument]);
+       fi
+       if test $ol_enable_sha1 = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable_sha1 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_rlookups = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable_rlookups 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_enable_slurpd = yes ; then
+               AC_MSG_ERROR([slurpd requires slapd]);
+       fi
 
-AC_SUBST(BUILD_LDAPD)
+       # force settings to no
+       ol_enable_ldbm=no
+       ol_enable_shell=no
+       ol_enable_passwd=no
+       ol_enable_aclgroup=no
+       ol_enable_crypt=no
+       ol_enable_md5=no
+       ol_enable_sha1=no
+       ol_enable_wrappers=no
+       ol_enable_phonetic=no
+       ol_enable_rlookups=no
+       ol_with_ldbm_api=no
+       ol_with_ldbm_type=no
+       ol_enable_slurpd=no
+
+elif test $ol_enable_ldbm = no ; then
+       dnl SLAPD without LDBM
+
+       if test $ol_with_ldbm_api != auto ; then
+               AC_MSG_WARN([LDBM disabled, ignoring --with_ldbm_api argument]);
+       fi
 
-AC_SUBST(BUILD_SLAPD)
-  AC_SUBST(SLAPD_LDBM)
-  AC_SUBST(SLAPD_PASSWD)
-  AC_SUBST(SLAPD_SHELL)
+       if test $ol_with_ldbm_type != auto ; then
+               AC_MSG_WARN([LDBM disabled, ignoring --with_ldbm_type argument]);
+       fi
 
-AC_SUBST(BUILD_SLURPD)
+       if test $ol_enable_passwd = no -a $ol_enable_shell = no ; then
+               AC_MSG_ERROR([slapd requires a backend]);
+       fi
 
+       ol_with_ldbm_api=no
+       ol_with_ldbm_type=no
 
-dnl general LDAP arguments
-LDAP_DEFS=
-LDAP_LIBS=
+else
+       dnl SLAPD with LDBM
 
-if test "$LDAP_DEBUG" = "yes" ; then
-       LDAP_DEFS="$LDAP_DEFS -DLDAP_DEBUG"
-fi
-if test "$LDAP_REFERRALS" = "yes" ; then
-       AC_DEFINE(LDAP_REFERRALS,1)
-       LDAP_DEFS="$LDAP_DEFS -DLDAP_REFERRALS"
-fi
-if test "$LDAP_CACHE" = "no" ; then
-       AC_DEFINE(LDAP_NOCACHE,1)
-       LDAP_DEFS="$LDAP_DEFS -DNO_CACHE"
+       if test $ol_with_ldbm_api = gdbm -a \
+               $ol_with_ldbm_type = btree ; then
+               AC_MSG_ERROR([GDBM 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]);
+       fi
 fi
-if test "$LDAP_CLDAP" = "yes" ; then
-       AC_DEFINE(LDAP_CONNECTIONLESS,1)
-       LDAP_DEFS="$LDAP_DEFS -DCLDAP"
+
+if test $ol_enable_slurpd = yes ; then
+       dnl SLURPD was specifically enabled
+       if test $ol_with_threads = no ; then
+               AC_MSG_ERROR([slurpd requires threads]);
+       fi
 fi
 
+AC_MSG_RESULT(done)
+
+## Initialize vars
+LDAP_DEFS=
+LDAP_LIBS=
+LDBM_DEFS=
+LDBM_LIBS=
+LTHREAD_DEFS=
 LTHREAD_LIBS=
-if test "$opt_thread" = "no" ; then
-       LTHREAD_DEFS="-DNO_THREADS"
-else
-       LTHREAD_DEFS="-DNO_THREADS"
-fi
+LUTIL_DEFS=
+LUTIL_LIBS=
 
-dnl ldapd arguments
 LDAPD_DEFS=
 LDAPD_LIBS=
-
-dnl slapd arguments
 SLAPD_DEFS=
-if test "$SLAPD_PHONETIC" = "yes" ; then
-       AC_DEFINE(SLAPD_PHONETIC,1)
-       SLAPD_DEFS="$SLAPD_DEFS -DSOUNDEX"
-fi
+SLAPD_LIBS=
+SLURPD_DEFS=
+SLURPD_LIBS=
 
-if test "$SLAPD_LDBM" = "yes" ; then
-       AC_DEFINE(SLAPD_LDBM,1)
-dnl    SLAPD_DEFS="$SLAPD_DEFS -DSLAPD_LDBM"
-fi
-if test "$SLAPD_PASSWD" = "yes" ; then
-       AC_DEFINE(SLAPD_PASSWD,1)
-dnl    SLAPD_DEFS="$SLAPD_DEFS -DSLAPD_PASSWD"
-fi
-if test "$SLAPD_SHELL" = "yes" ; then
-       AC_DEFINE(SLAPD_SHELL,1)
-dnl    SLAPD_DEFS="$SLAPD_DEFS -DSLAPD_SHELL"
-fi
+BUILD_LDAPD=no
+BUILD_SLAPD=no
+BUILD_SLURPD=no
 
-dnl slurpd arguments
-SLURPD_DEFS=
+BUILD_LDBM=no
+BUILD_PASSWD=no
+BUILD_SHELL=no
 
-dnl End Args
+dnl ----------------------------------------------------------------
+dnl Checks for programs
 
-dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_GCC_TRADITIONAL
 
@@ -193,82 +199,259 @@ AC_PROG_MAKE_SET
 
 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)
-
-ldbm_use="none"
-LDBM_LIB=""
-LDBM_DEFS=""
-
-if test "$SLAPD_LDBM" = "yes" ; then
-       if test $ldbm_prefer = any -o $ldbm_prefer = dbbtree \
-                       -o $ldbm_prefer = dbhash ; then
-               AC_CHECK_FUNC(dbopen,[
-                       ldbm_use=$ldbm_prefer
-                       ldbm_prefer=found],[
-                       AC_CHECK_LIB(db,dbopen,[
-                               ldbm_use=$ldbm_prefer
-                               ldbm_prefer=found
-                               LDBM_LIB="-ldb"
-                       ]) 
-               ])
-
-               if test $ldbm_prefer = found ; then
-                       if test $ldbm_use = dbhash ; then
-dnl                            AC_DEFINE(LDBM_USE_DBHASH,1)
-                               LDBM_DEFS="$LDAP_DEFS -DLDBM_USE_DBHASH"
-                       else
-dnl                            AC_DEFINE(LDBM_USE_DBBTREE,1)
-                               LDBM_DEFS="$LDAP_DEFS -DLDBM_USE_DBBTREE"
+AC_PATH_PROG(EDITOR, vi, /usr/ucb/vi, $PATH:/usr/ucb)
+AC_PATH_PROG(FINGER, finger, /usr/ucb/finger, $PATH:/usr/ucb)
+
+dnl ----------------------------------------------------------------
+dnl Checks for libraries
+
+ol_link_threads=no
+if test $ol_with_threads = auto -o $ol_with_threads = posix ; then
+       AC_CHECK_HEADERS(pthread.h sched.h)
+
+       if test "$ac_cv_header_pthread_h" = yes ; then
+               OL_POSIX_THREAD_VERSION
+
+               if test $ol_cv_pthread_version = final ; then
+                       LTHREAD_DEFS="$LTHREAD_DEFS -DPOSIX_THREADS"
+               elif test $ol_cv_pthread_version = draft4 ; then
+                       LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_MIT_PTHREADS"
+               else
+                       AC_MSG_ERROR([unknown pthread version])
+               fi
+
+               # consider threads found
+               ol_with_threads=found
+
+               OL_LINUX_THREADS
+
+               if test $ol_cv_linux_threads = yes ; then
+dnl                    AC_DEFINE(HAVE_LINUX_THREADS,1)
+                       LTHREAD_DEFS="$LTHREAD_DEFS -DHAVE_LINUX_THREADS"
+               fi
+
+               dnl Now the hard part, how to link
+
+               dnl A few platforms have pthread support in standard libraries
+               AC_CHECK_FUNC(pthread_create,[ol_link_threads=yes])
+
+               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 CPPFLAGS
+                               save_LIBS="$LIBS"
+                               LIBS="-pthread $LIBS"
+                               AC_TRY_LINK([#include <pthread.h>],[
+                                       pthread_create((pthread_t*) 0,
+                                               (pthread_attr_t*) 0, 0, 0);
+                                       ], 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 -lpthread
+                       save_LIBS="$LIBS"
+                       AC_CHECK_LIB(pthread, pthread_create, [
+                               ol_link_threads=posix
+                               LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"])
+                       LIBS="$save_LIBS"
+               fi
+
+               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
+
+               if test $ol_link_threads = no ; then
+                       dnl try DEC Threads
+                       save_LIBS="$LIBS"
+                       AC_CHECK_LIB(pthread, pthread_create, [
+                               ol_link_threads=posix
+                               LTHREAD_DEFS="$LTHREAD_DEFS -DDEC_THREADS"
+                               LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc -lc"],,
+                               [-lmach -lexc -lc])
+                       LIBS="$save_LIBS"
+               fi
+
+               if test $ol_link_threads != no ; then
+                       dnl All POSIX Thread (final) implementations should have sched_yield
+                       AC_CHECK_FUNC(sched_yield)
+               else
+                       AC_MSG_ERROR([could not link with POSIX Threads])
+               fi
+       fi
+
+       if test $ol_with_threads = posix ; then
+               AC_MSG_ERROR([could not locate POSIX Threads])
+       fi
+fi
+
+if test $ol_link_threads = no ; then
+       if test $ol_with_threads = yes ; then
+               AC_MSG_ERROR([no suitable thread support])
+       fi
+
+       if test $ol_with_threads = auto ; then
+               AC_MSG_WARN([no suitable thread support, disabling threads])
+               $ol_with_threads = no
+       fi
+
+       LTHREAD_DEFS="-DNO_THREADS"
+       LTHREAD_LIBS=""
+fi
+
+ol_link_ldbm=no 
+if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db2 ; then
+       OL_BERKELEY_DB2
+
+       if test $ol_cv_berkeley_db2 = yes ; then
+               ol_link_ldbm=db2
+               ol_with_ldbm_api=db2
+
+               LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DB2"
+
+               if test $ol_with_ldbm_type = hash ; then
+                       LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBHASH"
+               else
+                       LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBBTREE"
+               fi
+
+               if test $ol_cv_lib_db2 != yes ; then
+                       LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_db2"
+               fi
        fi
+fi
+
+if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db ; then
+       OL_BERKELEY_DB
+
+       if test $ol_cv_berkeley_db = yes ; then
+               ol_link_ldbm=db
+               ol_with_ldbm_api=db
 
-       if test $ldbm_prefer = any -o $ldbm_prefer = gdbm ; then
-               AC_CHECK_LIB(gdbm, gdbm_open,[
-                       ldbm_use=$ldbm_prefer
-                       ldbm_prefer=found
-                       LDBM_LIB="-lgdbm"
-dnl                    AC_DEFINE(LDBM_USE_GDBM,1)
-                       LDBM_DEFS="$LDAP_DEFS -DLDBM_USE_GDBM"
-               ]) 
+               if test $ac_cv_header_db_185_h = yes ; then
+                       LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DB2_COMPAT185"
+               fi
+
+               if test $ol_with_ldbm_type = hash ; then
+                       LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBHASH"
+               else
+                       LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBBTREE"
+               fi
+
+               if test $ol_cv_lib_db != yes ; then
+                       LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_db"
+               fi
        fi
-       if test $ldbm_prefer = any -o $ldbm_prefer = ndbm ; then
-               AC_CHECK_LIB(dbm,dbm_open,[
-                       ldbm_use=ndbm
-                       ldbm_prefer=found
-                       LDBM_LIB="-ldbm"
-dnl                    AC_DEFINE(LDBM_USE_NDBM,1)
-                       LDBM_DEFS="$LDAP_DEFS -DLDBM_USE_NDBM"
-               ]) 
+fi
+
+if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then
+       AC_MSG_WARN(Could not find LDBM with BTREE support);
+       $ol_with_ldbm_api=none
+fi
+
+if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then
+       OL_GDBM
+
+       if test $ol_cv_gdbm = yes ; then
+               ol_link_ldbm=gdbm
+               ol_with_ldbm_api=gdbm
+
+               LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_GDBM"
+
+               if test $ol_cv_lib_gdbm != yes ; then
+                       LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_gdbm"
+               fi
        fi
+fi
 
-       if test $ldbm_prefer != found ; then
-               AC_MSG_ERROR(could not find suitable db for $ldbm_prefer backend)
+if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = ndbm ; then
+       OL_NDBM
+
+       if test $ol_cv_ndbm = yes ; then
+               ol_link_ldbm=ndbm
+               ol_with_ldbm_api=ndbm
+
+               if test $ol_with_ldbm_api = ndbm ; then
+                       AC_WARN([Attempting to use NDBM.  Functionality will be limited.])
+               fi
+
+               LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_NDBM"
+
+               if test $ol_cv_lib_ndbm != yes ; then
+                       LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_ndbm"
+               fi
        fi
+fi
 
-       if test $ldbm_use = ndbm ; then
-               AC_MSG_WARN(LDBM using NDBM, functionality will be limited)
+if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then
+       AC_MSG_WARN(could not find suitable LDBM backend)
+       if test $ol_enable_ldbm = yes ; then
+               AC_MSG_ERROR(select appropriate LDBM options or disable)
        fi
+
+       AC_MSG_WARN(disabling LDBM)
+       $ol_enable_ldbm=no
+fi
+
+if test $ol_enable_wrappers = yes ; then
+       AC_CHECK_LIB(wrap, hosts_access,
+               [have_wrappers=yes], [have_wrappers=no])
+
+       if test $have_wrappers = yes ; then
+dnl            LIBTCPD="-lwrap"
+dnl            AC_DEFINE(HAVE_TCPD)
+               SLAPD_DEFS="$SLAPD_DEFS -DTCP_WRAPPERS"
+               SLAPD_LIBS="$SLAPD_LIBS -lwrap"
+       else
+               AC_MSG_WARN(could not find -lwrap)
+               if test $ol_enable_wrappers = yes ; then
+                       AC_MSG_ERROR(could not find wrappers, select appropriate options or disable)
+               fi
+
+               AC_MSG_WARN(disabling wrappers support)
+               ol_enable_wrappers=no
+       fi
+
 fi
 
 # ud needs termcap (should insert check here)
 LIBTERMCAP="-ltermcap"
 AC_SUBST(LIBTERMCAP)
 
-# FreeBSD has obsoleted re_comp(3) from -lc, needs -lcompat
-AC_CHECK_LIB(compat, re_comp) 
-
 # FreeBSD (and others) have crypt(3) in -lcrypt
-LIBCRYPT=
-AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT), [
-       AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"
-       AC_DEFINE(HAVE_CRYPT)])
-])
-AC_SUBST(LIBCRYPT)
+if test $ol_enable_crypt != no ; then
+       AC_CHECK_FUNC(crypt, have_crypt=yes, [
+               AC_CHECK_LIB(crypt, crypt, [LUTIL_LIBS="$LUTIL_LIBS -lcrypt"
+                       have_crypt=yes], [have_crypt=no])])
+
+       if test $have_crypt = yes ; then
+dnl            AC_DEFINE(SLAPD_CRYPT,1)
+               LUTIL_DEFS="$LUTIL_DEFS -DLDAP_CRYPT"
+       else
+               AC_MSG_WARN(could not find crypt)
+               if test $ol_enable_crypt = yes ; then
+                       AC_MSG_ERROR(could not find crypt, select appropriate options or disable)
+               fi
+
+               AC_MSG_WARN(disabling crypt support)
+               ol_enable_crypt=no
+       fi
+fi
 
+dnl ----------------------------------------------------------------
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -287,6 +470,7 @@ AC_CHECK_HEADERS( \
        unistd.h        \
 )
 
+dnl ----------------------------------------------------------------
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_GETGROUPS
 AC_TYPE_MODE_T
@@ -302,6 +486,7 @@ AC_STRUCT_TM
 dnl AC_C_BIGENDIAN
 AC_C_CONST
 
+dnl ----------------------------------------------------------------
 dnl Checks for library functions.
 AC_FUNC_MEMCMP
 AC_TYPE_SIGNAL
@@ -322,13 +507,101 @@ AC_CHECK_FUNCS(          \
        strtod                  \
        strtol                  \
        strtoul                 \
+       strsep                  \
        memcpy                  \
 )
 
 AC_REPLACE_FUNCS(strdup)
 
+dnl ----------------------------------------------------------------
 # Check Configuration
-CF_SYS_ERRLIST
+OL_SYS_ERRLIST
+
+dnl ----------------------------------------------------------------
+dnl Sort out defines
+
+if test $ol_enable_debug != no ; then
+       LDAP_DEFS="$LDAP_DEFS -DLDAP_DEBUG"
+fi
+#if test $ol_enable_syslog != no ; then
+#      LDAP_DEFS="$LDAP_DEFS -DLDAP_SYSLOG"
+#fi
+if test $ol_enable_libui = no ; then
+       LDAP_DEFS="$LDAP_DEFS -DNO_USERINTERFACE"
+fi
+if test $ol_enable_cache = no ; then
+       LDAP_DEFS="$LDAP_DEFS -DNO_CACHE"
+fi
+if test $ol_enable_dns != no ; then
+       LDAP_DEFS="$LDAP_DEFS -DLDAP_DNS"
+fi
+if test $ol_enable_referrals != no ; then
+       LDAP_DEFS="$LDAP_DEFS -DLDAP_REFERRALS"
+fi
+if test $ol_enable_cldap != no ; then
+       LDAP_DEFS="$LDAP_DEFS -DCLDAP"
+fi
+
+if test $ol_enable_aclgroup != no ; then
+       AC_DEFINE(SLAPD_ACLGROUP,1)
+       SLAPD_DEFS="$SLAPD_DEFS -DACLGROUP"
+fi
+
+if test $ol_enable_md5 != no ; then
+dnl    AC_DEFINE(SLAPD_MD5,1)
+       LUTIL_DEFS="$LUTIL_DEFS -DLDAP_MD5"
+fi
+
+if test $ol_enable_sha1 != no ; then
+dnl    AC_DEFINE(SLAPD_SHA1,1)
+       LUTIL_DEFS="$LUTIL_DEFS -DLDAP_SHA1"
+fi
+
+if test $ol_enable_phonetic != no ; then
+       AC_DEFINE(SLAPD_PHONETIC,1)
+       SLAPD_DEFS="$SLAPD_DEFS -DSOUNDEX"
+fi
+
+if test $ol_enable_rlookups != no ; then
+       AC_DEFINE(SLAPD_RLOOKUPS,1)
+       SLAPD_DEFS="$SLAPD_DEFS -DREVERSE_LOOKUPS"
+fi
+
+if test $ol_link_ldbm != no ; then
+dnl    AC_DEFINE(SLAPD_LDBM,1)
+       BUILD_SLAPD=yes
+       BUILD_LDBM=yes
+       LDBM_DEFS="-DLDAP_LDBM $LDBM_DEFS"
+fi
+
+if test $ol_enable_passwd != no ; then
+dnl    AC_DEFINE(SLAPD_PASSWD,1)
+       BUILD_SLAPD=yes
+       BUILD_PASSWD=yes
+       SLAPD_DEFS="-DLDAP_PASSWD $SLAPD_DEFS"
+fi
+
+if test $ol_enable_shell != no ; then
+dnl    AC_DEFINE(SLAPD_SHELL,1)
+       BUILD_SLAPD=yes
+       BUILD_SHELL=yes
+       SLAPD_DEFS="-DLDAP_SHELL $SLAPD_DEFS"
+fi
+
+if test $ol_enable_slurpd != no -a $ol_link_threads != no -a \
+       $BUILD_SLAPD = yes ; then
+       BUILD_SLURPD=yes
+fi
+
+dnl ----------------------------------------------------------------
+
+AC_SUBST(BUILD_LDAPD)
+AC_SUBST(BUILD_SLAPD)
+  AC_SUBST(BUILD_LDBM)
+  AC_SUBST(BUILD_PASSWD)
+  AC_SUBST(BUILD_SHELL)
+AC_SUBST(BUILD_SLURPD)
+
 
 AC_SUBST(LDAP_DEFS)
 AC_SUBST(LDAP_LIBS)
@@ -342,21 +615,27 @@ AC_SUBST(LDBM_DEFS)
 AC_SUBST(LDBM_LIBS)
 AC_SUBST(LTHREAD_DEFS)
 AC_SUBST(LTHREAD_LIBS)
+AC_SUBST(LUTIL_DEFS)
+AC_SUBST(LUTIL_LIBS)
+
+dnl ----------------------------------------------------------------
+dnl final output
+dnl
 
 dnl AC_OUTPUT( \
 dnl contrib/Makefile:build/top.mk:contrib/Makefile.in:build/dir.mk \
 dnl contrib/saucer/Makefile:build/top.mk:contrib/saucer/Makefile.in:build/rules.mk \
 dnl contrib/whois++/Makefile:build/top.mk:contrib/whois++/Makefile.in:build/rules.mk \
-dnl servers/ldapd/Makefile:build/top.mk:servers/ldapd/Makefile.in:build/srv.mk \
-dnl servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/srv.mk \
-dnl servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/srv.mk \
-dnl servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/srv.mk \
-dnl servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \
-dnl servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk \
-dnl Makefile:build/top.mk:Makefile.in:build/dir.mk, \
 dnl [date > stamp-h])
 
 AC_OUTPUT( \
+Makefile:build/top.mk:Makefile.in:build/dir.mk \
+doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk \
+doc/man/Makefile:build/top.mk:doc/man/Makefile.in:build/dir.mk \
+doc/man/man1/Makefile:build/top.mk:doc/man/man1/Makefile.in:build/man.mk \
+doc/man/man3/Makefile:build/top.mk:doc/man/man3/Makefile.in:build/man.mk \
+doc/man/man5/Makefile:build/top.mk:doc/man/man5/Makefile.in:build/man.mk \
+doc/man/man8/Makefile:build/top.mk:doc/man/man8/Makefile.in:build/man.mk \
 clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk \
 clients/finger/Makefile:build/top.mk:clients/finger/Makefile.in:build/rules.mk \
 clients/fax500/Makefile:build/top.mk:clients/fax500/Makefile.in:build/rules.mk \
@@ -375,8 +654,13 @@ libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.
 libraries/liblthread/Makefile:build/top.mk:libraries/liblthread/Makefile.in:build/lib.mk \
 libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk \
 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-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-shell/Makefile:build/top.mk:servers/slapd/back-shell/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 \
-Makefile:build/top.mk:Makefile.in:build/dir.mk \
 ,[date > stamp-h])