ITS#2361, skip sockname, peername, peerdomain, sockurl ACLs if the

[openldap] / configure.in
diff --git a/configure.in b/configure.in

index 27e73d29ea6378fcde05cc82a2cc5a028332c462..210a4d9a75a16e7dfd8f824aef89b81b051db8f4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
  dnl $OpenLDAP$
  dnl
  dnl $OpenLDAP$
  dnl
-dnl Copyright 1998-2001 The OpenLDAP Foundation.  All Rights Reserved.
+dnl Copyright 1998-2003 The OpenLDAP Foundation.  All Rights Reserved.
  dnl 
  dnl Redistribution and use in source and binary forms, with or without
  dnl modification, are permitted only as authorized by the OpenLDAP
  dnl 
  dnl Redistribution and use in source and binary forms, with or without
  dnl modification, are permitted only as authorized by the OpenLDAP
@@ -16,7 +16,7 @@ define([AC_INIT_BINSH],
  # $]OpenLDAP[$
  # from] translit([$OpenLDAP$], $")] [
  
  # $]OpenLDAP[$
  # from] translit([$OpenLDAP$], $")] [
  
-# Copyright 1998-2001 The OpenLDAP Foundation.  All Rights Reserved.
+# Copyright 1998-2003 The OpenLDAP Foundation.  All Rights Reserved.
  # 
  # Redistribution and use in source and binary forms, with or without
  # modification, are permitted only as authorized by the OpenLDAP
  # 
  # Redistribution and use in source and binary forms, with or without
  # modification, are permitted only as authorized by the OpenLDAP
@@ -24,8 +24,8 @@ define([AC_INIT_BINSH],
  # http://www.OpenLDAP.org/license.html or in file LICENSE in the
  # top-level directory of the distribution.
  
  # http://www.OpenLDAP.org/license.html or in file LICENSE in the
  # top-level directory of the distribution.
  
-echo "Copyright 1998-2001 The OpenLDAP Foundation,  All Rights Reserved."
-echo "Restrictions apply, see COPYRIGHT and LICENSE files."
+echo "Copyright 1998-2003 The OpenLDAP Foundation,  All Rights Reserved."
+echo " Restrictions apply, see COPYRIGHT and LICENSE files."
  ])dnl
  dnl ----------------------------------------------------------------
  dnl Disable config.cache!
  ])dnl
  dnl ----------------------------------------------------------------
  dnl Disable config.cache!
@@ -51,7 +51,24 @@ if test -z "$OL_STRING"; then
         AC_MSG_ERROR([could not determine version])
  fi
  
         AC_MSG_ERROR([could not determine version])
  fi
  
-echo "Configuring $OL_STRING ..."
+if test -f "$ac_aux_dir/shtool" -a ! -d $ac_aux_dir/shtool; then
+       ac_cv_shtool="$ac_aux_dir/shtool"
+else
+       AC_MSG_ERROR([no shtool found in $ac_aux_dir])
+fi
+
+SHTOOL="$ac_cv_shtool"
+dnl AC_SUBST(SHTOOL)dnl
+
+TB="`$SHTOOL echo -e '%B' 2>/dev/null`"
+TN="`$SHTOOL echo -e '%b' 2>/dev/null`"
+
+OPENLDAP_CVS=""
+if test -d $ac_aux_dir/CVS; then
+       OPENLDAP_CVS="(from CVS sources) "
+fi
+
+echo "Configuring ${TB}${OL_STRING}${TN} ${OPENLDAP_CVS}..."
  
  dnl Determine host platform
  dnl            we try not to use this for much
  
  dnl Determine host platform
  dnl            we try not to use this for much
@@ -71,9 +88,12 @@ AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_PATCH,$OL_PATCH,Patch)
  OPENLDAP_LIBVERSION=$OL_API_LIB
  AC_SUBST(OPENLDAP_LIBVERSION)dnl
  
  OPENLDAP_LIBVERSION=$OL_API_LIB
  AC_SUBST(OPENLDAP_LIBVERSION)dnl
  
+OPENLDAP_RELEASE_DATE="$OL_RELEASE_DATE"
+AC_SUBST(OPENLDAP_RELEASE_DATE)dnl
+
  dnl We use autoconf features new to 2.13.
  dnl aclocal.m4 should be built using aclocal from automake 1.4
  dnl We use autoconf features new to 2.13.
  dnl aclocal.m4 should be built using aclocal from automake 1.4
-dnl libtool 1.3.3 should be installed.
+dnl libtool 1.4.2 should be installed.
  AC_PREREQ(2.13)dnl Required Autoconf version
  
  AC_CONFIG_HEADER(include/portable.h include/ldap_features.h include/lber_types.h)dnl
  AC_PREREQ(2.13)dnl Required Autoconf version
  
  AC_CONFIG_HEADER(include/portable.h include/ldap_features.h include/lber_types.h)dnl
@@ -111,14 +131,15 @@ AC_SUBST(ldap_subdir)dnl
  dnl ----------------------------------------------------------------
  dnl General "enable" options
  OL_ARG_ENABLE(debug,[  --enable-debug    enable debugging], yes)dnl
  dnl ----------------------------------------------------------------
  dnl General "enable" options
  OL_ARG_ENABLE(debug,[  --enable-debug    enable debugging], yes)dnl
+OL_ARG_ENABLE(dynamic,[  --enable-dynamic        enable linking built binaries with dynamic libs], no)dnl
  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(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 (experimental)], no)dnl
-OL_ARG_ENABLE(referrals,[  --enable-referrals    enable LDAPv2+ Referrals (experimental)], no)dnl
-OL_ARG_ENABLE(kbind,[  --enable-kbind    enable LDAPv2+ Kerberos IV bind (deprecated)], no)dnl
+dnl OL_ARG_ENABLE(referrals,[  --enable-referrals        enable LDAPv2+ Referrals (experimental)], no)dnl
+ol_enable_referrals=${ol_enable_referrals-no}
+dnl OL_ARG_ENABLE(kbind,[  --enable-kbind        enable LDAPv2+ Kerberos IV bind (deprecated)], no)dnl
+ol_enable_kbind=${ol_enable_kbind-no}
  OL_ARG_ENABLE(ipv6,[  --enable-ipv6      enable IPv6 support], auto)dnl
  OL_ARG_ENABLE(local,[  --enable-local    enable AF_LOCAL (AF_UNIX) socket support], auto)dnl
  OL_ARG_ENABLE(ipv6,[  --enable-ipv6      enable IPv6 support], auto)dnl
  OL_ARG_ENABLE(local,[  --enable-local    enable AF_LOCAL (AF_UNIX) socket support], auto)dnl
-OL_ARG_ENABLE(rewrite,[  --enable-rewrite        enable rewrite], no)dnl
  OL_ARG_ENABLE(x_compile,[  --enable-x-compile    enable cross compiling],
         no, [yes no])dnl
  
  OL_ARG_ENABLE(x_compile,[  --enable-x-compile    enable cross compiling],
         no, [yes no])dnl
  
@@ -128,7 +149,7 @@ dnl OL_ARG_ENABLE(dmalloc,[  --enable-dmalloc         enable debug malloc support], no
  
  OL_ARG_WITH(cyrus_sasl,[  --with-cyrus-sasl      with Cyrus SASL support],
         auto, [auto yes no] )
  
  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],
+OL_ARG_WITH(fetch,[  --with-fetch                with fetch(3) URL support],
         auto, [auto yes no] )
  OL_ARG_WITH(kerberos,[  --with-kerberos          with Kerberos support],
         auto, [auto k5 k5only k425 kth k4 afs yes no])
         auto, [auto yes no] )
  OL_ARG_WITH(kerberos,[  --with-kerberos          with Kerberos support],
         auto, [auto k5 k5only k425 kth k4 afs yes no])
@@ -147,70 +168,78 @@ dnl ----------------------------------------------------------------
  
  dnl ----------------------------------------------------------------
  dnl SLAPD OPTIONS
  
  dnl ----------------------------------------------------------------
  dnl SLAPD OPTIONS
-AC_ARG_WITH(xxslapdoptions,[SLAPD (Standalone LDAP Daemon) Options:])
+AC_ARG_WITH(xxslapdoptions,[
+SLAPD (Standalone LDAP Daemon) Options:])
  OL_ARG_ENABLE(slapd,[  --enable-slapd    enable building slapd], yes)dnl
  OL_ARG_ENABLE(aci,[    --enable-aci      enable per-object ACIs (experimental)], no)dnl
  OL_ARG_ENABLE(cleartext,[    --enable-cleartext          enable cleartext passwords], yes)dnl
  OL_ARG_ENABLE(crypt,[    --enable-crypt          enable crypt(3) passwords], no)dnl
  OL_ARG_ENABLE(slapd,[  --enable-slapd    enable building slapd], yes)dnl
  OL_ARG_ENABLE(aci,[    --enable-aci      enable per-object ACIs (experimental)], no)dnl
  OL_ARG_ENABLE(cleartext,[    --enable-cleartext          enable cleartext passwords], yes)dnl
  OL_ARG_ENABLE(crypt,[    --enable-crypt          enable crypt(3) passwords], no)dnl
-OL_ARG_ENABLE(dynamic,[    --enable-dynamic      enable linking built binaries with dynamic libs], no)dnl
  OL_ARG_ENABLE(kpasswd,[    --enable-kpasswd      enable Kerberos password verification], no)dnl
  OL_ARG_ENABLE(lmpasswd,[    --enable-lmpasswd    enable LAN Manager passwords], no)dnl
  OL_ARG_ENABLE(spasswd,[    --enable-spasswd      enable (Cyrus) SASL password verification], no)dnl
  OL_ARG_ENABLE(modules,[    --enable-modules      enable dynamic module support], no)dnl
  dnl OL_ARG_ENABLE(multimaster,[    --enable-multimaster  enable multimaster replication], no)dnl
  OL_ARG_ENABLE(kpasswd,[    --enable-kpasswd      enable Kerberos password verification], no)dnl
  OL_ARG_ENABLE(lmpasswd,[    --enable-lmpasswd    enable LAN Manager passwords], no)dnl
  OL_ARG_ENABLE(spasswd,[    --enable-spasswd      enable (Cyrus) SASL password verification], no)dnl
  OL_ARG_ENABLE(modules,[    --enable-modules      enable dynamic module support], no)dnl
  dnl OL_ARG_ENABLE(multimaster,[    --enable-multimaster  enable multimaster replication], no)dnl
+ol_enable_multimaster=${ol_enable_multimaster-no}
  OL_ARG_ENABLE(phonetic,[    --enable-phonetic    enable phonetic/soundex], no)dnl
  OL_ARG_ENABLE(phonetic,[    --enable-phonetic    enable phonetic/soundex], no)dnl
-OL_ARG_ENABLE(rlookups,[    --enable-rlookups    enable reverse lookups], no)dnl
-OL_ARG_ENABLE(slp, [    --enable-slp          enable SLPv2 support], no)dnl     
+OL_ARG_ENABLE(rewrite,[    --enable-rewrite      enable DN rewriting in back-ldap and back-meta], no)dnl
+OL_ARG_ENABLE(rlookups,[    --enable-rlookups    enable reverse lookups of client hostnames], no)dnl
+OL_ARG_ENABLE(slapi,[    --enable-slapi        enable installation of slapi library], no)dnl
+OL_ARG_ENABLE(slp,[    --enable-slp          enable SLPv2 support], no)dnl     
  OL_ARG_ENABLE(wrappers,[    --enable-wrappers    enable tcp wrapper support], no)dnl
  
  OL_ARG_ENABLE(wrappers,[    --enable-wrappers    enable tcp wrapper support], no)dnl
  
+
  dnl SLAPD Backend options
  dnl SLAPD Backend options
-OL_ARG_ENABLE(bdb,[    --enable-bdb      enable Berkeley DB backend], no)dnl
-OL_ARG_WITH(bdb_module,[    --with-bdb-module     module type], static,
+OL_ARG_ENABLE(bdb,[    --enable-bdb      enable Berkeley DB backend], yes)dnl
+OL_ARG_WITH(bdb_module,[    --with-bdb-module     module type static|dynamic], static,
         [static dynamic])
  OL_ARG_ENABLE(dnssrv,[    --enable-dnssrv        enable dnssrv backend], no)dnl
         [static dynamic])
  OL_ARG_ENABLE(dnssrv,[    --enable-dnssrv        enable dnssrv backend], no)dnl
-OL_ARG_WITH(dnssrv_module,[    --with-dnssrv-module  module type], static,
+OL_ARG_WITH(dnssrv_module,[    --with-dnssrv-module  module type static|dynamic], static,
         [static dynamic])
  OL_ARG_ENABLE(ldap,[    --enable-ldap    enable ldap backend], no)dnl
         [static dynamic])
  OL_ARG_ENABLE(ldap,[    --enable-ldap    enable ldap backend], no)dnl
-OL_ARG_WITH(ldap_module,[    --with-ldap-module          module type], static,
+OL_ARG_WITH(ldap_module,[    --with-ldap-module          module type static|dynamic], static,
         [static dynamic])
         [static dynamic])
-OL_ARG_ENABLE(ldbm,[    --enable-ldbm    enable ldbm backend], yes)dnl
-OL_ARG_WITH(ldbm_api,[    --with-ldbm-api       with LDBM API], auto,
+OL_ARG_ENABLE(ldbm,[    --enable-ldbm    enable ldbm backend], no)dnl
+OL_ARG_WITH(ldbm_api,[    --with-ldbm-api       with LDBM API auto|berkeley|bcompat|mdbm|gdbm], auto,
         [auto berkeley bcompat mdbm gdbm])
         [auto berkeley bcompat mdbm gdbm])
-OL_ARG_WITH(ldbm_module,[    --with-ldbm-module          module type], static,
+OL_ARG_WITH(ldbm_module,[    --with-ldbm-module          module type static|dynamic], static,
         [static dynamic])
         [static dynamic])
-OL_ARG_WITH(ldbm_type,[    --with-ldbm-type      use LDBM type], auto,
+OL_ARG_WITH(ldbm_type,[    --with-ldbm-type      use LDBM type auto|btree|hash], auto,
         [auto btree hash])
  OL_ARG_ENABLE(meta,[    --enable-meta    enable metadirectory backend], no)dnl
         [auto btree hash])
  OL_ARG_ENABLE(meta,[    --enable-meta    enable metadirectory backend], no)dnl
-OL_ARG_WITH(meta_module,[    --with-meta-module          module type], static,
+OL_ARG_WITH(meta_module,[    --with-meta-module          module type static|dynamic], static,
         [static dynamic])
  OL_ARG_ENABLE(monitor,[    --enable-monitor      enable monitor backend], no)dnl
         [static dynamic])
  OL_ARG_ENABLE(monitor,[    --enable-monitor      enable monitor backend], no)dnl
-OL_ARG_WITH(monitor_module,[    --with-monitor-module    module type], static,
+OL_ARG_WITH(monitor_module,[    --with-monitor-module module type static|dynamic], static,
+       [static dynamic])
+OL_ARG_ENABLE(null,[    --enable-null    enable null backend], no)dnl
+OL_ARG_WITH(null_module,[    --with-null-module          module type static|dynamic], static,
         [static dynamic])
  OL_ARG_ENABLE(passwd,[    --enable-passwd        enable passwd backend], no)dnl
         [static dynamic])
  OL_ARG_ENABLE(passwd,[    --enable-passwd        enable passwd backend], no)dnl
-OL_ARG_WITH(passwd_module,[    --with-passwd-module  module type], static,
+OL_ARG_WITH(passwd_module,[    --with-passwd-module  module type static|dynamic], static,
         [static dynamic])
  OL_ARG_ENABLE(perl,[    --enable-perl    enable perl backend], no)dnl
         [static dynamic])
  OL_ARG_ENABLE(perl,[    --enable-perl    enable perl backend], no)dnl
-OL_ARG_WITH(perl_module,[    --with-perl-module          module type], static,
+OL_ARG_WITH(perl_module,[    --with-perl-module          module type static|dynamic], static,
         [static dynamic])
  OL_ARG_ENABLE(shell,[    --enable-shell          enable shell backend], no)dnl
         [static dynamic])
  OL_ARG_ENABLE(shell,[    --enable-shell          enable shell backend], no)dnl
-OL_ARG_WITH(shell_module,[    --with-shell-module        module type], static,
+OL_ARG_WITH(shell_module,[    --with-shell-module        module type static|dynamic], static,
         [static dynamic])
  OL_ARG_ENABLE(sql,[    --enable-sql      enable sql backend], no)dnl
         [static dynamic])
  OL_ARG_ENABLE(sql,[    --enable-sql      enable sql backend], no)dnl
-OL_ARG_WITH(sql_module,[    --with-sql-module    module type], static,
+OL_ARG_WITH(sql_module,[    --with-sql-module    module type static|dynamic], static,
         [static dynamic])
  OL_ARG_ENABLE(tcl,[    --enable-tcl      enable tcl backend], no)dnl
         [static dynamic])
  OL_ARG_ENABLE(tcl,[    --enable-tcl      enable tcl backend], no)dnl
-OL_ARG_WITH(tcl_module,[    --with-tcl-module    module type], static,
+OL_ARG_WITH(tcl_module,[    --with-tcl-module    module type static|dynamic], static,
         [static dynamic])
  
  dnl ----------------------------------------------------------------
  dnl SLURPD OPTIONS
         [static dynamic])
  
  dnl ----------------------------------------------------------------
  dnl SLURPD OPTIONS
-AC_ARG_WITH(xxslurpdoptions,[SLURPD (Replication Daemon) Options:])
+AC_ARG_WITH(xxslurpdoptions,[
+SLURPD (Replication Daemon) Options:])
  OL_ARG_ENABLE(slurpd,[  --enable-slurpd          enable building slurpd], auto)dnl
  
  dnl ----------------------------------------------------------------
  OL_ARG_ENABLE(slurpd,[  --enable-slurpd          enable building slurpd], auto)dnl
  
  dnl ----------------------------------------------------------------
-AC_ARG_WITH(xxliboptions,[Library Generation & Linking Options])
+AC_ARG_WITH(xxliboptions,[
+Library Generation & Linking Options])
  AC_ENABLE_STATIC
  AC_ENABLE_STATIC
-dnl AC_DISABLE_SHARED
  AC_ENABLE_SHARED
  
  dnl ----------------------------------------------------------------
  AC_ENABLE_SHARED
  
  dnl ----------------------------------------------------------------
@@ -219,6 +248,9 @@ dnl General "enable" options
  # validate options
  if test $ol_enable_slapd = no ; then
         dnl SLAPD was specificallly disabled
  # validate options
  if test $ol_enable_slapd = no ; then
         dnl SLAPD was specificallly disabled
+       if test $ol_enable_slapi = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable-slapi argument])
+       fi
         if test $ol_enable_bdb = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-bdb argument])
         fi
         if test $ol_enable_bdb = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-bdb argument])
         fi
@@ -234,9 +266,12 @@ if test $ol_enable_slapd = no ; then
         if test $ol_enable_meta = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-meta argument])
         fi
         if test $ol_enable_meta = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-meta argument])
         fi
-       if test $ol_enable_module = yes ; then
+       if test $ol_enable_monitor = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-monitor argument])
         fi
                 AC_MSG_WARN([slapd disabled, ignoring --enable-monitor argument])
         fi
+       if test $ol_enable_null = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable-null argument])
+       fi
         if test $ol_enable_passwd = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-passwd argument])
         fi
         if test $ol_enable_passwd = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-passwd argument])
         fi
@@ -255,9 +290,9 @@ if test $ol_enable_slapd = no ; then
         if test $ol_enable_modules = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-modules argument])
         fi
         if test $ol_enable_modules = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-modules argument])
         fi
-dnl    if test $ol_enable_multimaster = yes ; then
-dnl            AC_MSG_WARN([slapd disabled, ignoring --enable-multimaster argument])
-dnl    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_wrappers = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-wrappers argument])
         fi
@@ -294,6 +329,9 @@ dnl fi
         if test $ol_with_monitor_module != static ; then
                 AC_MSG_WARN([slapd disabled, ignoring --with-monitor-module argument])
         fi
         if test $ol_with_monitor_module != static ; then
                 AC_MSG_WARN([slapd disabled, ignoring --with-monitor-module argument])
         fi
+       if test $ol_with_null_module != static ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-null-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_passwd_module != static ; then
                 AC_MSG_WARN([slapd disabled, ignoring --with-passwd-module argument])
         fi
@@ -317,12 +355,14 @@ dnl       fi
         fi
  
         # force settings to no
         fi
  
         # force settings to no
+       ol_enable_slapi=no
         ol_enable_bdb=no
         ol_enable_dnssrv=no
         ol_enable_ldap=no
         ol_enable_ldbm=no
         ol_enable_meta=no
         ol_enable_monitor=no
         ol_enable_bdb=no
         ol_enable_dnssrv=no
         ol_enable_ldap=no
         ol_enable_ldbm=no
         ol_enable_meta=no
         ol_enable_monitor=no
+       ol_enable_null=no
         ol_enable_passwd=no
         ol_enable_perl=no
         ol_enable_shell=no
         ol_enable_passwd=no
         ol_enable_perl=no
         ol_enable_shell=no
@@ -330,7 +370,7 @@ dnl fi
         ol_enable_sql=no
  
         ol_enable_modules=no
         ol_enable_sql=no
  
         ol_enable_modules=no
-dnl    ol_enable_multimaster=no
+       ol_enable_multimaster=no
         ol_enable_phonetic=no
         ol_enable_rlookups=no
         ol_enable_aci=no
         ol_enable_phonetic=no
         ol_enable_rlookups=no
         ol_enable_aci=no
@@ -346,6 +386,7 @@ dnl ol_enable_multimaster=no
         ol_with_ldbm_module=static
         ol_with_meta_module=static
         ol_with_monitor_module=static
         ol_with_ldbm_module=static
         ol_with_meta_module=static
         ol_with_monitor_module=static
+       ol_with_null_module=static
         ol_with_passwd_module=static
         ol_with_perl_module=static
         ol_with_shell_module=static
         ol_with_passwd_module=static
         ol_with_perl_module=static
         ol_with_shell_module=static
@@ -377,6 +418,7 @@ elif test $ol_enable_ldbm = no ; then
                 $ol_enable_ldap = no -a \
                 $ol_enable_meta = no -a \
                 $ol_enable_monitor = no -a \
                 $ol_enable_ldap = no -a \
                 $ol_enable_meta = no -a \
                 $ol_enable_monitor = no -a \
+               $ol_enable_null = no -a \
                 $ol_enable_passwd = no -a \
                 $ol_enable_perl = no -a \
                 $ol_enable_shell = no -a \
                 $ol_enable_passwd = no -a \
                 $ol_enable_perl = no -a \
                 $ol_enable_shell = no -a \
@@ -446,13 +488,17 @@ fi
  if test $ol_enable_kbind = yes -o $ol_enable_kpasswd = yes ; then
         if test $ol_with_kerberos = no ; then
                 AC_MSG_ERROR([options require --with-kerberos])
  if test $ol_enable_kbind = yes -o $ol_enable_kpasswd = yes ; then
         if test $ol_with_kerberos = no ; then
                 AC_MSG_ERROR([options require --with-kerberos])
+       elif test $ol_with_kerberos = auto ; then
+               ol_with_kerberos=yes
         fi
         fi
-       ol_with_kerberos=yes
+
  elif test $ol_enable_kbind = no -o $ol_enable_kpasswd = no ; then
  elif test $ol_enable_kbind = no -o $ol_enable_kpasswd = no ; then
-       if test $ol_with_kerberos != no -a $ol_with_kerberos != auto ; then
+       if test $ol_with_kerberos = auto ; then
+               ol_with_kerberos=no
+       elif test $ol_with_kerberos != no ; then
                 AC_MSG_WARN([Kerberos detection enabled unnecessarily]);
                 AC_MSG_WARN([Kerberos detection enabled unnecessarily]);
+               ol_with_kerberos=no
         fi
         fi
-       ol_with_kerberos=no
  fi
  
  if test $ol_enable_spasswd = yes ; then
  fi
  
  if test $ol_enable_spasswd = yes ; then
@@ -468,7 +514,6 @@ dnl ----------------------------------------------------------------
  dnl Initialize vars
  LDAP_LIBS=
  LDIF_LIBS=
  dnl Initialize vars
  LDAP_LIBS=
  LDIF_LIBS=
-LDBM_LIB=
  LDBM_LIBS=
  LTHREAD_LIBS=
  LUTIL_LIBS=
  LDBM_LIBS=
  LTHREAD_LIBS=
  LUTIL_LIBS=
@@ -481,12 +526,16 @@ BUILD_SLURPD=no
  
  BUILD_THREAD=no
  
  
  BUILD_THREAD=no
  
+BUILD_SLAPI=no
+SLAPD_SLAPI_DEPEND=
+
  BUILD_BDB=no
  BUILD_DNSSRV=no
  BUILD_LDAP=no
  BUILD_LDBM=no
  BUILD_META=no
  BUILD_MONITOR=no
  BUILD_BDB=no
  BUILD_DNSSRV=no
  BUILD_LDAP=no
  BUILD_LDBM=no
  BUILD_META=no
  BUILD_MONITOR=no
+BUILD_NULL=no
  BUILD_PASSWD=no
  BUILD_PERL=no
  BUILD_SHELL=no
  BUILD_PASSWD=no
  BUILD_PERL=no
  BUILD_SHELL=no
@@ -499,6 +548,7 @@ BUILD_LDAP_DYNAMIC=static
  BUILD_LDBM_DYNAMIC=static
  BUILD_META_DYNAMIC=static
  BUILD_MONITOR_DYNAMIC=static
  BUILD_LDBM_DYNAMIC=static
  BUILD_META_DYNAMIC=static
  BUILD_MONITOR_DYNAMIC=static
+BUILD_NULL_DYNAMIC=static
  BUILD_PASSWD_DYNAMIC=static
  BUILD_PERL_DYNAMIC=static
  BUILD_SHELL_DYNAMIC=static
  BUILD_PASSWD_DYNAMIC=static
  BUILD_PERL_DYNAMIC=static
  BUILD_SHELL_DYNAMIC=static
@@ -507,7 +557,9 @@ BUILD_SQL_DYNAMIC=static
  
  SLAPD_MODULES_LDFLAGS=
  SLAPD_MODULES_CPPFLAGS=
  
  SLAPD_MODULES_LDFLAGS=
  SLAPD_MODULES_CPPFLAGS=
-SLAPD_MODULES_LIST=
+
+SLAPD_STATIC_BACKENDS=
+SLAPD_DYNAMIC_BACKENDS=
  
  SLAPD_PERL_LDFLAGS=
  MOD_PERL_LDFLAGS=
  
  SLAPD_PERL_LDFLAGS=
  MOD_PERL_LDFLAGS=
@@ -525,6 +577,9 @@ SASL_LIBS=
  TERMCAP_LIBS=
  TLS_LIBS=
  MODULES_LIBS=
  TERMCAP_LIBS=
  TLS_LIBS=
  MODULES_LIBS=
+SLAPI_LIBS=
+LIBSLAPI=
+LIBSLAPITOOLS=
  AUTH_LIBS=
  
  SLAPD_SLP_LIBS=
  AUTH_LIBS=
  
  SLAPD_SLP_LIBS=
@@ -532,7 +587,7 @@ SLAPD_SLP_LIBS=
  dnl ================================================================
  dnl Checks for programs
  
  dnl ================================================================
  dnl Checks for programs
  
-dnl AC_PROG_INSTALL
+AC_PROG_INSTALL
  
  AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion])
  
  
  AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion])
  
@@ -583,30 +638,28 @@ if test $ol_aix_threads = yes ; then
  fi
  
  if test -z "${CC}"; then
  fi
  
  if test -z "${CC}"; then
-       AC_CHECK_PROGS(CC,cc)
+       AC_CHECK_PROGS(CC,cc gcc,missing)
+
+       if test "${CC}" = "missing" ; then
+               AC_MSG_ERROR([Unable to locate cc(1) or suitable replacement.  Check PATH or set CC.])
+       fi
  fi
  
  fi
  
-dnl The default CFLAGS is empty NOT whatever AC_PROG_CC sets.
-dnl (for now, let autoconf sort this out)
-dnl CFLAGS=${CFLAGS-""}
+if test -z "${AR}"; then
+       AC_CHECK_PROGS(AR,ar gar,missing)
+
+       if test "${AR}" = "missing" ; then
+               AC_MSG_ERROR([Unable to locate ar(1) or suitable replacement.  Check PATH or set AR.])
+       fi
+fi
  
  AC_LIBTOOL_WIN32_DLL
  AC_LIBTOOL_DLOPEN
  AC_PROG_LIBTOOL
  
  
  AC_LIBTOOL_WIN32_DLL
  AC_LIBTOOL_DLOPEN
  AC_PROG_LIBTOOL
  
-AC_PROG_AWK
  OL_PROG_LN_H
  AC_PROG_LN_S
  
  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)
-
  dnl ----------------------------------------------------------------
  dnl Perl
  ol_link_perl=no
  dnl ----------------------------------------------------------------
  dnl Perl
  ol_link_perl=no
@@ -648,9 +701,9 @@ fi
  
  dnl ----------------------------------------------------------------
  dnl Checks for UNIX Variants
  
  dnl ----------------------------------------------------------------
  dnl Checks for UNIX Variants
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
+dnl AC_AIX
+dnl AC_ISC_POSIX
+dnl AC_MINIX
  
  dnl ----------------------------------------------------------------
  dnl Checks for system services
  
  dnl ----------------------------------------------------------------
  dnl Checks for system services
@@ -659,7 +712,7 @@ AC_MINGW32
  AC_EXEEXT
  AC_OBJEXT
  
  AC_EXEEXT
  AC_OBJEXT
  
-AC_DEFINE_UNQUOTED( EXEEXT, "${EXEEXT}", [defined to be the EXE extension])
+AC_DEFINE_UNQUOTED(EXEEXT, "${EXEEXT}", [defined to be the EXE extension])
  
  dnl ----------------------------------------------------------------
  dnl BeOS requires -lbe -lroot -lnet
  
  dnl ----------------------------------------------------------------
  dnl BeOS requires -lbe -lroot -lnet
@@ -687,6 +740,14 @@ AC_CHECK_LIB(s, afopen, [
         AC_DEFINE(HAVE_AIX_SECURITY,1,[define if you have AIX security lib])
  ])
  
         AC_DEFINE(HAVE_AIX_SECURITY,1,[define if you have AIX security lib])
  ])
  
+dnl ----------------------------------------------------------------
+dnl Check for IBM OS/390
+case "$target" in
+*-ibm-openedition)
+       ac_cv_func_getopt=no
+       AC_DEFINE(BOTH_STRINGS_H,1,[define to use both <string.h> and <strings.h>])
+       ;;
+esac
  
  dnl ----------------------------------------------------------------
  dnl Check for module support
  
  dnl ----------------------------------------------------------------
  dnl Check for module support
@@ -699,8 +760,8 @@ if test $ol_enable_modules != no ; then
         fi
  
         AC_CHECK_LIB(ltdl, lt_dlinit, [
         fi
  
         AC_CHECK_LIB(ltdl, lt_dlinit, [
-           MODULES_LIBS=-lltdl
-           AC_DEFINE(HAVE_LIBLTDL,1,[define if you have libtool -ltdl])
+               MODULES_LIBS=-lltdl
+               AC_DEFINE(HAVE_LIBLTDL,1,[define if you have libtool -ltdl])
         ])
  
         if test "$ac_cv_lib_ltdl_lt_dlinit" = no ; then
         ])
  
         if test "$ac_cv_lib_ltdl_lt_dlinit" = no ; then
@@ -714,6 +775,7 @@ else
         ol_with_ldbm_module=static
         ol_with_meta_module=static
         ol_with_monitor_module=static
         ol_with_ldbm_module=static
         ol_with_meta_module=static
         ol_with_monitor_module=static
+       ol_with_null_module=static
         ol_with_passwd_module=static
         ol_with_perl_module=static
         ol_with_shell_module=static
         ol_with_passwd_module=static
         ol_with_perl_module=static
         ol_with_shell_module=static
@@ -774,13 +836,17 @@ AC_CHECK_HEADERS( \
         sys/resource.h  \
         sys/select.h    \
         sys/socket.h    \
         sys/resource.h  \
         sys/select.h    \
         sys/socket.h    \
+       sys/stat.h              \
         sys/syslog.h    \
         sys/time.h              \
         sys/types.h             \
         sys/syslog.h    \
         sys/time.h              \
         sys/types.h             \
+       sys/ucred.h             \
+       sys/uio.h               \
         syslog.h                \
         termios.h               \
         unistd.h                \
         winsock.h               \
         syslog.h                \
         termios.h               \
         unistd.h                \
         winsock.h               \
+       winsock2.h              \
  )
  
  
  )
  
  
@@ -790,26 +856,46 @@ dnl Checks for libraries
  AC_CHECK_FUNC(dlopen, :, [AC_CHECK_LIB(dl, dlopen)])
  
  dnl HP-UX requires -lV3
  AC_CHECK_FUNC(dlopen, :, [AC_CHECK_LIB(dl, dlopen)])
  
  dnl HP-UX requires -lV3
+dnl this is not needed on newer versions of HP-UX
  AC_CHECK_LIB(V3, sigset)
  
  AC_CHECK_LIB(V3, sigset)
  
-dnl Gotta check for winsock manually
-if test $ac_cv_header_winsock_h = yes; then
-       AC_CACHE_CHECK([for winsock], [ol_cv_winsock], 
-       AC_TRY_LINK([#include <winsock.h>],[
-                       socket(0,0,0);
-                       select(0,NULL,NULL,NULL,NULL);
-                       closesocket(0);
-                       gethostname(NULL,0);
-       ],[ol_cv_winsock=yes],[ol_cv_winsock=no]))
-
-       if test $ol_cv_winsock = yes ; then
-               AC_DEFINE(HAVE_WINSOCK,1,[define if you have winsock])
+dnl The following is INTENTIONALLY scripted out because shell does not
+dnl support variable names with the '@' character, which is what
+dnl autoconf would try to generate if one merely used AC_SEARCH_LIBS
+AC_MSG_CHECKING(for winsock)
+save_LIBS="$LIBS"
+for curlib in ws2_32 wsock32; do
+       LIBS="$LIBS -l$curlib"
+       AC_TRY_LINK([
+                       char socket@12();
+                       char select@20();
+                       char closesocket@4();
+                       char gethostname@8();
+                       ],
+                       [
+                       socket@12();
+                       select@20();
+                       closesocket@4();
+                       gethostname@8();
+                       ],
+                       have_winsock=yes, have_winsock=no)
+
+       if test $have_winsock = yes; then
+               AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock])
                 ac_cv_func_socket=yes
                 ac_cv_func_select=yes
                 ac_cv_func_closesocket=yes
                 ac_cv_func_gethostname=yes
                 ac_cv_func_socket=yes
                 ac_cv_func_select=yes
                 ac_cv_func_closesocket=yes
                 ac_cv_func_gethostname=yes
+               if test $curlib = ws2_32; then
+                       have_winsock=winsock2
+                       AC_DEFINE(HAVE_WINSOCK2, 1,
+                                 [define if you have winsock2])
+               fi
+               break
         fi
         fi
-fi
+       LIBS="$save_LIBS"
+done
+AC_MSG_RESULT($have_winsock)
  
  dnl Find socket()
  dnl Likely combinations:
  
  dnl Find socket()
  dnl Likely combinations:
@@ -830,10 +916,10 @@ dnl require select
  AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.]))
  
  if test "${ac_cv_header_winsock_h}" != yes; then
  AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.]))
  
  if test "${ac_cv_header_winsock_h}" != yes; then
-    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 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
  fi
  
  dnl check to see if system call automatically restart
  fi
  
  dnl check to see if system call automatically restart
@@ -845,17 +931,65 @@ AC_CHECK_HEADERS( regex.h )
  if test "$ac_cv_header_regex_h" != yes ; then
         AC_MSG_ERROR([POSIX regex.h required.])
  fi
  if test "$ac_cv_header_regex_h" != yes ; then
         AC_MSG_ERROR([POSIX regex.h required.])
  fi
-AC_CHECK_FUNC(regfree, :, AC_MSG_ERROR([POSIX regex required.]))
+AC_SEARCH_LIBS(regfree, [regex gnuregex],
+       :, AC_MSG_ERROR([POSIX regex required.]))
  
  OL_POSIX_REGEX
  if test "$ol_cv_c_posix_regex" = no ; then
         AC_MSG_ERROR([broken POSIX regex!])
  fi
  
  
  OL_POSIX_REGEX
  if test "$ol_cv_c_posix_regex" = no ; then
         AC_MSG_ERROR([broken POSIX regex!])
  fi
  
+dnl ----------------------------------------------------------------
+dnl UUID Support
+
+have_uuid=no
+AC_CHECK_HEADERS(sys/uuid.h)
+if test $ac_cv_header_sys_uuid_h = yes ; then
+       save_LIBS="$LIBS"
+       AC_SEARCH_LIBS(uuid_to_str, uuid, [have_uuid=yes], :)
+       LIBS="$save_LIBS"
+
+       if test have_uuid = yes ; then
+               AC_DEFINE(HAVE_UUID_TO_STR,1,
+                       [define if you have uuid_to_str()])
+
+               test "$ac_cv_search_uuid_to_str" = "none required" || \
+                       SLAPD_LIBS="$SLAPD_LIBS $ac_cv_search_uuid_to_str"
+       fi
+fi
+
+dnl For windows, check for the need of RPCRT for UUID function support
+if test $have_uuid = no ; then
+       AC_MSG_CHECKING(to see if -lrpcrt4 is needed for win32 UUID support)
+       save_LIBS="$LIBS"
+       LIBS="$LIBS -lrpcrt4"
+       AC_TRY_LINK([
+               char UuidCreate@4();
+               char UuidToStringA@8();
+               ],
+               [
+               UuidCreate@4();
+               UuidToStringA@8();
+               ],
+               need_rpcrt=yes, need_rpcrt=no)
+       if test $need_rpcrt = yes; then
+               SLAPD_LIBS="$SLAPD_LIBS -lrpcrt4"
+       fi
+       LIBS="$save_LIBS"
+       AC_MSG_RESULT($need_rpcrt)
+fi
+
  dnl ----------------------------------------------------------------
  dnl Check for resolver routines
  dnl ----------------------------------------------------------------
  dnl Check for resolver routines
+dnl      need to check for both res_query and __res_query
+dnl   need to check -lc, -lbind, and -lresolv
  ol_link_dnssrv=no
  AC_CHECK_FUNC(res_query,:)
  ol_link_dnssrv=no
  AC_CHECK_FUNC(res_query,:)
+if test $ac_cv_func_res_query = no ; then 
+       AC_CHECK_FUNC(__res_query,:)
+       ac_cv_func_res_query=$ac_cv_func___res_query
+fi
+
  if test $ac_cv_func_res_query = no ; then 
         AC_CHECK_LIB(bind, res_query)
         ac_cv_func_res_query=$ac_cv_lib_bind_res_query
  if test $ac_cv_func_res_query = no ; then 
         AC_CHECK_LIB(bind, res_query)
         ac_cv_func_res_query=$ac_cv_lib_bind_res_query
@@ -871,6 +1005,11 @@ if test $ac_cv_func_res_query = no ; then
         ac_cv_func_res_query=$ac_cv_lib_resolv_res_query
  fi
  
         ac_cv_func_res_query=$ac_cv_lib_resolv_res_query
  fi
  
+if test $ac_cv_func_res_query = no ; then 
+       AC_CHECK_LIB(resolv, __res_query)
+       ac_cv_func_res_query=$ac_cv_lib_resolv___res_query
+fi
+
  if test "$ac_cv_func_res_query" = yes ; then
         AC_DEFINE(HAVE_RES_QUERY,1,
                 [define if you have res_query()])
  if test "$ac_cv_func_res_query" = yes ; then
         AC_DEFINE(HAVE_RES_QUERY,1,
                 [define if you have res_query()])
@@ -887,16 +1026,14 @@ fi
  dnl ----------------------------------------------------------------
  dnl PF_INET6 support requires getaddrinfo and INET6_ADDRSTRLEN
  dnl PF_LOCAL may use getaddrinfo in available
  dnl ----------------------------------------------------------------
  dnl PF_INET6 support requires getaddrinfo and INET6_ADDRSTRLEN
  dnl PF_LOCAL may use getaddrinfo in available
-AC_CHECK_FUNCS( getaddrinfo inet_ntop )
+AC_CHECK_FUNCS( getaddrinfo getnameinfo gai_strerror inet_ntop )
  
  ol_link_ipv6=no
  if test $ac_cv_func_getaddrinfo = no -o $ac_cv_func_inet_ntop = no ; then
         if test $ol_enable_ipv6 = yes ; then
                 AC_MSG_ERROR([IPv6 support requires getaddrinfo() and inet_ntop()])
         fi
  
  ol_link_ipv6=no
  if test $ac_cv_func_getaddrinfo = no -o $ac_cv_func_inet_ntop = no ; then
         if test $ol_enable_ipv6 = yes ; then
                 AC_MSG_ERROR([IPv6 support requires getaddrinfo() and inet_ntop()])
         fi
-else
-       AC_CHECK_FUNCS( gai_strerror )
-
+elif test $ol_enable_ipv6 != no ; then
         AC_CACHE_CHECK([INET6_ADDRSTRLEN],[ol_cv_inet6_addrstrlen],[
                 AC_EGREP_CPP(__has_inet6_addrstrlen__,[
  #                      include <netinet/in.h>
         AC_CACHE_CHECK([INET6_ADDRSTRLEN],[ol_cv_inet6_addrstrlen],[
                 AC_EGREP_CPP(__has_inet6_addrstrlen__,[
  #                      include <netinet/in.h>
@@ -905,10 +1042,25 @@ else
  #                      endif
                 ], [ol_cv_inet6_addrstrlen=yes], [ol_cv_inet6_addrstrlen=no])])
  
  #                      endif
                 ], [ol_cv_inet6_addrstrlen=yes], [ol_cv_inet6_addrstrlen=no])])
  
-       if test $ol_cv_inet6_addrstrlen = yes ; then
+
+       AC_CACHE_CHECK([struct sockaddr_storage],ol_cv_struct_sockaddr_storage,[
+               AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+],[
+                       struct sockaddr_storage ss;
+],                     [ol_cv_struct_sockaddr_storage=yes],
+                       [ol_cv_struct_sockaddr_storage=no])])
+
+       if test $ol_cv_inet6_addrstrlen = yes \
+               -a $ol_cv_struct_sockaddr_storage = yes ; then
                 ol_link_ipv6=yes
                 ol_link_ipv6=yes
-       elif test $ol_enable_ipv6 = yes ; then
+       elif test $ol_enable_ipv6 = yes \
+                       -a $ol_cv_inet6_addrstrlen = no ; then
                 AC_MSG_ERROR([IPv6 support requires INET6_ADDRSTRLEN])
                 AC_MSG_ERROR([IPv6 support requires INET6_ADDRSTRLEN])
+       elif test $ol_enable_ipv6 = yes \
+                       -a $ol_cv_struct_sockaddr_storage = no ; then
+               AC_MSG_ERROR([IPv6 support requires struct sockaddr_storage])
         fi
  fi
  
         fi
  fi
  
@@ -945,24 +1097,33 @@ if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \
                 fi
  
                 if test $krb5_impl = mit; then
                 fi
  
                 if test $krb5_impl = mit; then
+                       AC_CHECK_LIB(k5crypto, main,
+                               [krb5crypto=k5crypto],
+                               [krb5crypto=crypto])
+
                         AC_CHECK_LIB(krb5, main,
                                 [have_krb5=yes
                         AC_CHECK_LIB(krb5, main,
                                 [have_krb5=yes
-                               KRB5_LIBS="-lkrb5 -lcrypto -lcom_err"],
+                               KRB5_LIBS="-lkrb5 -l$krb5crypto -lcom_err"],
                                 [have_krb5=no],
                                 [have_krb5=no],
-                               [-lcrypto -lcom_err])
+                               [-l$krb5crypto -lcom_err])
  
                 elif test $krb5_impl = heimdal; then
  
                 elif test $krb5_impl = heimdal; then
+                       AC_CHECK_LIB(des, main,
+                               [krb5crypto=des],
+                               [krb5crypto=crypto])
+
                         AC_CHECK_LIB(krb5, main,
                                 [have_krb5=yes
                         AC_CHECK_LIB(krb5, main,
                                 [have_krb5=yes
-                               KRB5_LIBS="-lkrb5 -ldes -lasn1 -lroken -lcom_err"],
+                               KRB5_LIBS="-lkrb5 -l$krb5crypto -lasn1 -lroken -lcom_err"],
                                 [have_krb5=no],
                                 [have_krb5=no],
-                               [-ldes -lasn1 -lroken -lcom_err])
+                               [-l$krb5crypto -lasn1 -lroken -lcom_err])
  
                         AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1,
                                 [define if you have HEIMDAL Kerberos])
  
                         AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1,
                                 [define if you have HEIMDAL Kerberos])
+
                 else
                         have_krb5=no
                 else
                         have_krb5=no
-                       AC_MSG_WARN([Unrecongized Kerberos5 Implementation])
+                       AC_MSG_WARN([Unrecognized Kerberos5 Implementation])
                 fi
  
                 if test $have_krb5 = yes ; then
                 fi
  
                 if test $have_krb5 = yes ; then
@@ -995,12 +1156,12 @@ if test $ol_link_krb5 = yes -a \( $ol_with_kerberos = yes -o \
                 if test $krb5_impl = mit; then
                         AC_CHECK_LIB(krb4, main, [have_k425=yes
                                 KRB4_LIBS="-lkrb4 -ldes425"], [have_k425=no],
                 if test $krb5_impl = mit; then
                         AC_CHECK_LIB(krb4, main, [have_k425=yes
                                 KRB4_LIBS="-lkrb4 -ldes425"], [have_k425=no],
-                               [-ldes425 -lkrb5 -lcrypto -lcom_err])
+                               [-ldes425 -lkrb5 -l$krb5crypto -lcom_err])
  
                 elif test $krb5_impl = heimdal; then
                         AC_CHECK_LIB(krb4, main, [have_k425=yes
                                 KRB4_LIBS="-lkrb4"], [have_k425=no],
  
                 elif test $krb5_impl = heimdal; then
                         AC_CHECK_LIB(krb4, main, [have_k425=yes
                                 KRB4_LIBS="-lkrb4"], [have_k425=no],
-                               [-lkrb5 -ldes -lasn1 -lroken -lcom_err])
+                               [-lkrb5 -l$krb5crypto -lasn1 -lroken -lcom_err])
  
                 else
                         have_425=no
  
                 else
                         have_425=no
@@ -1095,7 +1256,8 @@ ol_link_tls=no
  if test $ol_with_tls != no ; then
         AC_CHECK_HEADERS(openssl/ssl.h ssl.h)
         
  if test $ol_with_tls != no ; then
         AC_CHECK_HEADERS(openssl/ssl.h ssl.h)
         
-       if test $ac_cv_header_openssl_ssl_h = yes -o $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],
                 AC_CHECK_LIB(ssl, SSLeay_add_ssl_algorithms, 
                         [have_ssleay=yes
                         need_rsaref=no],
@@ -1135,7 +1297,7 @@ if test $ol_with_tls != no ; then
         fi
  
  else
         fi
  
  else
-       AC_WARN([TLS privacy protection not supported!])
+       AC_WARN([TLS data protection not supported!])
  fi
  
  if test $ol_link_tls = yes ; then
  fi
  
  if test $ol_link_tls = yes ; then
@@ -1143,7 +1305,7 @@ if test $ol_link_tls = yes ; then
  
  elif test $ol_with_tls = auto ; then
         AC_WARN([Could not locate TLS/SSL package])
  
  elif test $ol_with_tls = auto ; then
         AC_WARN([Could not locate TLS/SSL package])
-       AC_WARN([TLS privacy protection not supported!])
+       AC_WARN([TLS data protection not supported!])
  
  elif test $ol_with_tls != no ; then
         AC_ERROR([Could not locate TLS/SSL package])
  
  elif test $ol_with_tls != no ; then
         AC_ERROR([Could not locate TLS/SSL package])
@@ -1159,47 +1321,6 @@ if test $ol_enable_lmpasswd != no; then
         AC_DEFINE(SLAPD_LMHASH, 1, [define to support LAN Manager passwords])
  fi
  
         AC_DEFINE(SLAPD_LMHASH, 1, [define to support LAN Manager passwords])
  fi
  
-dnl ----------------------------------------------------------------
-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
-
  dnl ----------------------------------------------------------------
  dnl Threads?
  ol_link_threads=no
  dnl ----------------------------------------------------------------
  dnl Threads?
  ol_link_threads=no
@@ -1210,9 +1331,9 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
         OL_NT_THREADS
  
         if test "$ol_cv_nt_threads" = yes ; then
         OL_NT_THREADS
  
         if test "$ol_cv_nt_threads" = yes ; then
-       ol_link_threads=nt
-       ol_with_threads=found
-       ol_with_yielding_select=yes
+               ol_link_threads=nt
+               ol_with_threads=found
+               ol_with_yielding_select=yes
  
                 AC_DEFINE(HAVE_NT_SERVICE_MANAGER,1,[if you have NT Service Manager])
                 AC_DEFINE(HAVE_NT_EVENT_LOG,1,[if you have NT Event Log])
  
                 AC_DEFINE(HAVE_NT_SERVICE_MANAGER,1,[if you have NT Service Manager])
                 AC_DEFINE(HAVE_NT_EVENT_LOG,1,[if you have NT Event Log])
@@ -1231,12 +1352,9 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
         if test $ac_cv_header_pthread_h = yes ; then
                 OL_POSIX_THREAD_VERSION
  
         if test $ac_cv_header_pthread_h = yes ; then
                 OL_POSIX_THREAD_VERSION
  
-               if test $ol_cv_pthread_version = final ; then
-                       AC_DEFINE(HAVE_PTHREADS_FINAL,1,
-                               [define if pthreads API compatible with final spec])
-               elif test $ol_cv_pthread_version = draft4 ; then
-                       AC_DEFINE(HAVE_PTHREADS_D4,1,
-                               [define if pthreads API compatible with draft4 spec])
+               if test $ol_cv_pthread_version != 0 ; then
+                       AC_DEFINE_UNQUOTED(HAVE_PTHREADS,$ol_cv_pthread_version,
+                               [define to pthreads API spec revision])
                 else
                         AC_MSG_ERROR([unknown pthread version])
                 fi
                 else
                         AC_MSG_ERROR([unknown pthread version])
                 fi
@@ -1331,9 +1449,6 @@ dnl                       [ol_cv_pthread_lpthread_lexc])
                 OL_PTHREAD_TRY([-lpthreads],[ol_cv_pthread_lib_lpthreads])
  
                 if test $ol_link_threads != no ; then
                 OL_PTHREAD_TRY([-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
                         LTHREAD_LIBS="$LTHREAD_LIBS $ol_link_pthreads"
  
                         dnl save flags
@@ -1343,11 +1458,12 @@ dnl                     [ol_cv_pthread_lpthread_lexc])
  
                         dnl All POSIX Thread (final) implementations should have
                         dnl sched_yield instead of pthread yield.
  
                         dnl All POSIX Thread (final) implementations should have
                         dnl sched_yield instead of pthread yield.
-                       dnl check for both
-                       AC_CHECK_FUNCS(sched_yield pthread_yield)
+                       dnl check for both, and thr_yield for Solaris
+                       AC_CHECK_FUNCS(sched_yield pthread_yield thr_yield)
  
                         if test $ac_cv_func_sched_yield = no -a \
  
                         if test $ac_cv_func_sched_yield = no -a \
-                               $ac_cv_func_pthread_yield = no ; then
+                               $ac_cv_func_pthread_yield = no -a \
+                               $ac_cv_func_thr_yield = no ; then
                                 dnl Digital UNIX has sched_yield() in -lrt
                                 AC_CHECK_LIB(rt, sched_yield,
                                         [LTHREAD_LIBS="$LTHREAD_LIBS -lrt"
                                 dnl Digital UNIX has sched_yield() in -lrt
                                 AC_CHECK_LIB(rt, sched_yield,
                                         [LTHREAD_LIBS="$LTHREAD_LIBS -lrt"
@@ -1356,12 +1472,6 @@ dnl                      [ol_cv_pthread_lpthread_lexc])
                                         ac_cv_func_sched_yield=yes],
                                         [ac_cv_func_sched_yield=no])
                         fi
                                         ac_cv_func_sched_yield=yes],
                                         [ac_cv_func_sched_yield=no])
                         fi
-                       if test $ac_cv_func_sched_yield = no -a \
-                               $ac_cv_func_pthread_yield = no ; then
-                               dnl Solaris has sched_yield() stub in -lposix4
-                               dnl but we'll use thr_yield instead.
-                               AC_CHECK_FUNCS(thr_yield)
-                       fi
                         if test $ac_cv_func_sched_yield = no -a \
                                 $ac_cv_func_pthread_yield = no -a \
                                 "$ac_cv_func_thr_yield" = no ; then
                         if test $ac_cv_func_sched_yield = no -a \
                                 $ac_cv_func_pthread_yield = no -a \
                                 "$ac_cv_func_thr_yield" = no ; then
@@ -1482,18 +1592,19 @@ int main(argc, argv)
  #endif
  #endif
  
  #endif
  #endif
  
-#if HAVE_PTHREADS_D4
+#if HAVE_PTHREADS < 6
         pthread_create(&t, pthread_attr_default, task, NULL);
  #else
         pthread_create(&t, NULL, task, NULL);
  #endif
  
         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 */
-#else
-#ifdef HAVE_PTHREAD_YIELD
-       pthread_yield();        /* make sure task runs first */
-#endif
+       /* make sure task runs first */
+#if HAVE_THR_YIELD
+       thr_yield();
+#elif defined( HAVE_SCHED_YIELD )
+       sched_yield();
+#elif defined( HAVE_PTHREAD_YIELD )
+       pthread_yield();
  #endif
  
         exit(2);
  #endif
  
         exit(2);
@@ -1528,11 +1639,11 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
         -o $ol_with_threads = mach ; then
  
         dnl check for Mach CThreads
         -o $ol_with_threads = mach ; then
  
         dnl check for Mach CThreads
-       AC_CHECK_HEADERS(mach/cthreads.h)
+       AC_CHECK_HEADERS(mach/cthreads.h cthreads.h)
         if test $ac_cv_header_mach_cthreads_h = yes ; then
                 ol_with_threads=found
  
         if test $ac_cv_header_mach_cthreads_h = yes ; then
                 ol_with_threads=found
  
-               dnl check for cthread support in current $LIBS
+               dnl check for cthreads support in current $LIBS
                 AC_CHECK_FUNC(cthread_fork,[ol_link_threads=yes])
  
                 if test $ol_link_threads = no ; then
                 AC_CHECK_FUNC(cthread_fork,[ol_link_threads=yes])
  
                 if test $ol_link_threads = no ; then
@@ -1553,21 +1664,40 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                         if test $ol_cv_cthread_all_load = yes ; then
                                 LTHREAD_LIBS="$LTHREAD_LIBS -all_load"
                                 ol_link_threads=mach
                         if test $ol_cv_cthread_all_load = yes ; then
                                 LTHREAD_LIBS="$LTHREAD_LIBS -all_load"
                                 ol_link_threads=mach
+                               ol_with_threads=found
                         fi
                 fi
  
                         fi
                 fi
  
-               if test $ol_link_threads != no ; then
-                       : check for cthread specific functionality here
-                       AC_DEFINE(HAVE_MACH_CTHREADS,1,
-                               [define if you have Mach Cthreads])
+       elif test $ac_cv_header_cthreads_h = yes ; then
+               dnl Hurd variant of Mach Cthreads
+               dnl uses <cthreads.h> and -lthreads
+
+               ol_with_threads=found
+ 
+               dnl save the flags
+               save_LIBS="$LIBS"
+               LIBS="$LIBS -lthreads"
+               AC_CHECK_FUNC(cthread_fork,[ol_link_threads=yes])
+               LIBS="$save_LIBS"
+
+               if test $ol_link_threads = yes ; then
+                       LTHREAD_LIBS="-lthreads"
+                       ol_link_threads=mach
+                       ol_with_threads=found
                 else
                         AC_MSG_ERROR([could not link with Mach CThreads])
                 fi
                 else
                         AC_MSG_ERROR([could not link with Mach CThreads])
                 fi
-       fi
  
  
-       if test $ol_with_threads = mach ; then
+       elif test $ol_with_threads = mach ; then
                 AC_MSG_ERROR([could not locate Mach CThreads])
         fi
                 AC_MSG_ERROR([could not locate Mach CThreads])
         fi
+
+       if test $ol_link_threads = mach ; then
+               AC_DEFINE(HAVE_MACH_CTHREADS,1,
+                       [define if you have Mach Cthreads])
+       elif test $ol_with_threads = found ; then
+               AC_MSG_ERROR([could not link with Mach CThreads])
+       fi
  fi
  
  if test $ol_with_threads = auto -o $ol_with_threads = yes \
  fi
  
  if test $ol_with_threads = auto -o $ol_with_threads = yes \
@@ -1582,6 +1712,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                         AC_DEFINE(HAVE_GNU_PTH,1,[if you have GNU Pth])
                         LTHREAD_LIBS="$LTHREAD_LIBS -lpth"
                         ol_link_threads=pth
                         AC_DEFINE(HAVE_GNU_PTH,1,[if you have GNU Pth])
                         LTHREAD_LIBS="$LTHREAD_LIBS -lpth"
                         ol_link_threads=pth
+                       ol_with_threads=found
  
                         if test $ol_with_yielding_select = auto ; then
                                 ol_with_yielding_select=yes
  
                         if test $ol_with_yielding_select = auto ; then
                                 ol_with_yielding_select=yes
@@ -1690,8 +1821,7 @@ if test $ol_link_threads != no -a $ol_link_threads != nt ; then
         fi
  
  dnl When in thread environment, use 
         fi
  
  dnl When in thread environment, use 
-dnl            #if defined( HAVE_REENTRANT_FUNCTIONS ) \ 
-dnl                    || defined( HAVE_FUNC_R )
+dnl            #if defined( HAVE_REENTRANT_FUNCTIONS ) || defined( HAVE_FUNC_R )
  dnl                    func_r(...);
  dnl            #else
  dnl            #       if defined( HAVE_THREADS ) 
  dnl                    func_r(...);
  dnl            #else
  dnl            #       if defined( HAVE_THREADS ) 
@@ -1708,14 +1838,14 @@ dnl             _POSIX_REENTRANT_FUNCTIONS
  dnl            _POSIX_THREAD_SAFE_FUNCTIONS
  dnl            _POSIX_THREADSAFE_FUNCTIONS
  dnl
  dnl            _POSIX_THREAD_SAFE_FUNCTIONS
  dnl            _POSIX_THREADSAFE_FUNCTIONS
  dnl
-dnl            and is currently defined in lthread.h
+dnl            and is currently defined in <ldap_pvt_thread.h>
  dnl
  dnl
-dnl HAVE_THREADS is defined by lthread.h iff -UNO_THREADS
+dnl HAVE_THREADS is defined by <ldap_pvt_thread.h> iff -UNO_THREADS
  dnl 
  dnl 
-dnl libldap/*.c should only include <lthread.h> iff
+dnl libldap/*.c should only include <ldap_pvt_thread.h> iff
  dnl LDAP_R_COMPILE is defined.  ie:
  dnl            #ifdef LDAP_R_COMPILE
  dnl LDAP_R_COMPILE is defined.  ie:
  dnl            #ifdef LDAP_R_COMPILE
-dnl            #       include LDAP_R_COMPILE
+dnl            #       include <ldap_pvt_thread.h>
  dnl            #endif
  dnl
  dnl LDAP_R_COMPILE is defined by libldap_r/Makefile.in
  dnl            #endif
  dnl
  dnl LDAP_R_COMPILE is defined by libldap_r/Makefile.in
@@ -1725,7 +1855,7 @@ dnl
  dnl    dnl check for reentrant/threadsafe functions
  dnl    dnl
  dnl    dnl note: these should only be used when linking
  dnl    dnl check for reentrant/threadsafe functions
  dnl    dnl
  dnl    dnl note: these should only be used when linking
-dnl    dnl       with $LTHREAD_LIBS
+dnl    dnl             with $LTHREAD_LIBS
  dnl    dnl
  dnl    save_CPPFLAGS="$CPPFLAGS"
  dnl    save_LIBS="$LIBS"
  dnl    dnl
  dnl    save_CPPFLAGS="$CPPFLAGS"
  dnl    save_LIBS="$LIBS"
@@ -1760,6 +1890,32 @@ if test $ol_link_threads != no ; then
         AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE,1)
  fi
  
         AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE,1)
  fi
  
+dnl ----------------------------------------------------------------
+dnl Tests for reentrant functions necessary to build -lldap_r
+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
+
  dnl ----------------------------------------------------------------
  ol_link_ldbm=no 
  
  dnl ----------------------------------------------------------------
  ol_link_ldbm=no 
  
@@ -1797,9 +1953,17 @@ if test $ol_with_ldbm_api = auto \
  fi
  
  if test $ol_enable_bdb = yes -a $ol_link_ldbm != berkeley ; then
  fi
  
  if test $ol_enable_bdb = yes -a $ol_link_ldbm != berkeley ; then
-       AC_MSG_ERROR(BerkeleyDB not availabl)
-elif test $ol_enable_bdb != no -a $ol_link_ldbm != no ; then
-       ol_enable_bdb=yes
+       AC_MSG_ERROR(BDB: BerkeleyDB not available)
+elif test $ol_enable_bdb != no -a $ol_link_ldbm = berkeley ; then
+       OL_BDB_COMPAT
+
+       if test $ol_cv_bdb_compat = yes ; then
+               ol_enable_bdb=yes
+       elif test $ol_enable_bdb = yes ; then
+               AC_MSG_ERROR(BDB: BerkeleyDB version incompatible)
+       else
+               ol_enable_bdb=no
+       fi
  fi
  
  if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then
  fi
  
  if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then
@@ -1856,40 +2020,59 @@ if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then
  fi
  
  dnl ----------------------------------------------------------------
  fi
  
  dnl ----------------------------------------------------------------
+
  if test $ol_enable_dynamic = yes -a $enable_shared = yes ; then
  if test $ol_enable_dynamic = yes -a $enable_shared = yes ; then
-       LINK_BINS_DYNAMIC="yes"
+       BUILD_LIBS_DYNAMIC=shared
+       AC_DEFINE(LDAP_LIBS_DYNAMIC, 1, [define if LDAP libs are dynamic])
+       LTSTATIC=""
  else
  else
-       LINK_BINS_DYNAMIC="no"
+       BUILD_LIBS_DYNAMIC=static
+       LTSTATIC="-static"
  fi
  fi
+AC_SUBST(LTSTATIC)dnl
  
  dnl ----------------------------------------------------------------
  if test $ol_enable_wrappers != no ; then
  
  dnl ----------------------------------------------------------------
  if test $ol_enable_wrappers != no ; then
-       AC_CHECK_HEADERS(tcpd.h)
+       AC_CHECK_HEADERS(tcpd.h,[
+               AC_MSG_CHECKING([for TCP wrappers library])
+               save_LIBS="$LIBS"
+               LIBS="$LIBS -lwrap"
+               AC_TRY_LINK([
+#include <tcpd.h>
+int allow_severity = 0;
+int deny_severity  = 0;
  
  
-       if test $ac_cv_header_tcpd_h != yes ; then
-               have_wrappers=no
-       else
-               AC_TRY_COMPILE([
+struct request_info *req;
+               ],[
+hosts_access(req)
+               ],[AC_MSG_RESULT([-lwrap])
+               have_wrappers=yes
+               LIBS="$save_LIBS"],[
+               dnl try with -lnsl
+               LIBS="$LIBS -lnsl"
+               AC_TRY_LINK([
+#include <tcpd.h>
  int allow_severity = 0;
  int deny_severity  = 0;
  int allow_severity = 0;
  int deny_severity  = 0;
-               ],[hosts_access()],[have_wrappers=yes],[have_wrappers=no])
-       fi
+
+struct request_info *req;
+               ],[
+hosts_access(req)
+               ],[AC_MSG_RESULT([-lwrap -lnsl])
+               have_wrappers=yes
+               LIBS="$save_LIBS -lnsl"],[
+               AC_MSG_RESULT(no)
+               have_wrappers=no
+               LIBS=$save_LIBS])],[
+               have_wrappers=no])],[have_wrappers=no])
  
         if test $have_wrappers = yes ; then
                 AC_DEFINE(HAVE_TCPD,1, [define if you have -lwrap])
                 WRAP_LIBS="-lwrap"
  
         if test $have_wrappers = yes ; then
                 AC_DEFINE(HAVE_TCPD,1, [define if you have -lwrap])
                 WRAP_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)
+       elif test $ol_enable_wrappers = yes ; then
+               AC_MSG_ERROR([could not find TCP wrappers, select apppropriate options ore disable])
         else
         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
+               AC_MSG_WARN([could not find TCP wrappers, support disabled])
                 WRAP_LIBS=""
         fi
  fi
                 WRAP_LIBS=""
         fi
  fi
@@ -1914,6 +2097,10 @@ dnl ----------------------------------------------------------------
  dnl SQL
  ol_link_sql=no
  if test $ol_enable_sql != no ; then
  dnl SQL
  ol_link_sql=no
  if test $ol_enable_sql != no ; then
+       AC_CHECK_HEADERS(sql.h sqlext.h,[],[
+               AC_MSG_ERROR([could not locate SQL headers])
+       ])
+
         AC_CHECK_LIB(iodbc,SQLDriverConnect,[have_iodbc=yes],[have_iodbc=no])
         if test $have_iodbc = yes ; then
                 ol_link_sql="-liodbc"
         AC_CHECK_LIB(iodbc,SQLDriverConnect,[have_iodbc=yes],[have_iodbc=no])
         if test $have_iodbc = yes ; then
                 ol_link_sql="-liodbc"
@@ -1944,9 +2131,9 @@ if test $ol_enable_tcl != no ; then
                         AC_CHECK_LIB($lib,main,
                           [have_tcl=yes
                            if test x"$ol_with_tcl_module" = "xstatic" ; then
                         AC_CHECK_LIB($lib,main,
                           [have_tcl=yes
                            if test x"$ol_with_tcl_module" = "xstatic" ; then
-                              SLAPD_LIBS="$SLAPD_LIBS -l${lib}"
+                                       SLAPD_LIBS="$SLAPD_LIBS -l${lib}"
                            else
                            else
-                              MOD_TCL_LIB="-l${lib}"
+                                       MOD_TCL_LIB="-l${lib}"
                            fi;break],[have_tcl=no])
                 done
         fi
                            fi;break],[have_tcl=no])
                 done
         fi
@@ -1996,17 +2183,13 @@ dnl
  ol_link_sasl=no
  ol_link_spasswd=no
  if test $ol_with_cyrus_sasl != no ; then
  ol_link_sasl=no
  ol_link_spasswd=no
  if test $ol_with_cyrus_sasl != no ; then
-       AC_CHECK_HEADERS(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])
+       AC_CHECK_HEADERS(sasl/sasl.h sasl.h)
  
  
-               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
+       if test $ac_cv_header_sasl_sasl_h = yes -o $ac_cv_header_sasl_h = yes; then
+               AC_CHECK_LIB(sasl2, sasl_client_init,
+                       [ol_link_sasl="-lsasl2"],
+                       [AC_CHECK_LIB(sasl, sasl_client_init,
+                               [ol_link_sasl="-lsasl"])])
         fi
  
         if test $ol_link_sasl = no ; then
         fi
  
         if test $ol_link_sasl = no ; then
@@ -2019,9 +2202,24 @@ if test $ol_with_cyrus_sasl != no ; then
                                 AC_MSG_WARN([Strong authentication not supported!])
                         fi
                 fi
                                 AC_MSG_WARN([Strong authentication not supported!])
                         fi
                 fi
+       else
+               OL_SASL_COMPAT
+               if test $ol_cv_sasl_compat = no ; then
+                       ol_link_sasl=no
+                       AC_MSG_ERROR([Cyrus SASL library located but incompatible])
+               fi
  
  
-       elif test $ol_enable_spasswd != no ; then
-               ol_link_spasswd=yes
+               AC_DEFINE(HAVE_CYRUS_SASL,1,[define if you have Cyrus SASL])
+               SASL_LIBS="$ol_link_sasl"
+               if test $ol_enable_spasswd != no ; then
+                       ol_link_spasswd=yes
+               fi
+
+               ac_save_LIBS="$LIBS"
+               LIBS="$LIBS $ol_link_sasl"
+               AC_CHECK_FUNC(sasl_version, [AC_DEFINE(HAVE_SASL_VERSION,1,
+                       [define if your SASL library has sasl_version()])])
+               LIBS="$ac_save_LIBS"
         fi
  
  else
         fi
  
  else
@@ -2033,7 +2231,7 @@ fi
  
  dnl ----------------------------------------------------------------
  dnl Check for entropy sources
  
  dnl ----------------------------------------------------------------
  dnl Check for entropy sources
-if test $cross_compiling != yes ; then
+if test $cross_compiling != yes -a "$ac_cv_mingw32" != yes ; then
         dev=no
         if test -r /dev/urandom ; then
                 dev="/dev/urandom";
         dev=no
         if test -r /dev/urandom ; then
                 dev="/dev/urandom";
@@ -2102,10 +2300,16 @@ fi
  dnl ----------------------------------------------------------------
  dnl FreeBSD (and others) have crypt(3) in -lcrypt
  if test $ol_enable_crypt != no ; then
  dnl ----------------------------------------------------------------
  dnl FreeBSD (and others) have crypt(3) in -lcrypt
  if test $ol_enable_crypt != no ; then
+       save_LIBS="$LIBS"
+       LIBS="$TLS_LIBS $LIBS"
+
         AC_CHECK_FUNC(crypt, [have_crypt=yes], [
         AC_CHECK_FUNC(crypt, [have_crypt=yes], [
+               LIBS="$save_LIBS"
                 AC_CHECK_LIB(crypt, crypt, [LUTIL_LIBS="$LUTIL_LIBS -lcrypt"
                         have_crypt=yes], [have_crypt=no])])
  
                 AC_CHECK_LIB(crypt, crypt, [LUTIL_LIBS="$LUTIL_LIBS -lcrypt"
                         have_crypt=yes], [have_crypt=no])])
  
+       LIBS="$save_LIBS"
+
         if test $have_crypt = yes ; then
                 AC_DEFINE(HAVE_CRYPT,1, [define if crypt(3) is available])
         else
         if test $have_crypt = yes ; then
                 AC_DEFINE(HAVE_CRYPT,1, [define if crypt(3) is available])
         else
@@ -2227,7 +2431,7 @@ AC_FUNC_VPRINTF
  
  if test $ac_cv_func_vprintf = yes ; then
         dnl check for vsnprintf
  
  if test $ac_cv_func_vprintf = yes ; then
         dnl check for vsnprintf
-       AC_CHECK_FUNCS(vsnprintf vsprintf)
+       AC_CHECK_FUNCS(snprintf vsnprintf)
  fi
  
  AC_CHECK_FUNCS(                \
  fi
  
  AC_CHECK_FUNCS(                \
@@ -2238,6 +2442,7 @@ AC_CHECK_FUNCS(           \
         endpwent                \
         fcntl                   \
         flock                   \
         endpwent                \
         fcntl                   \
         flock                   \
+       fstat                   \
         getdtablesize   \
         getgrgid                \
         gethostname             \
         getdtablesize   \
         getgrgid                \
         gethostname             \
@@ -2251,6 +2456,8 @@ AC_CHECK_FUNCS(           \
         lockf                   \
         memcpy                  \
         memmove                 \
         lockf                   \
         memcpy                  \
         memmove                 \
+       mkstemp                 \
+       mktemp                  \
         pipe                    \
         read                    \
         recv                    \
         pipe                    \
         read                    \
         recv                    \
@@ -2274,18 +2481,32 @@ AC_CHECK_FUNCS(         \
         strtoul                 \
         strspn                  \
         sysconf                 \
         strtoul                 \
         strspn                  \
         sysconf                 \
+       usleep                  \
         waitpid                 \
         wait4                   \
         write                   \
         send                    \
         waitpid                 \
         wait4                   \
         write                   \
         send                    \
+       sendmsg                 \
         sendto                  \
  )
  
  dnl We actually may need to replace more than this.
         sendto                  \
  )
  
  dnl We actually may need to replace more than this.
-AC_REPLACE_FUNCS(getopt)
+AC_REPLACE_FUNCS(getopt getpeereid)
  
  if test "$ac_cv_func_getopt" != yes; then
  
  if test "$ac_cv_func_getopt" != yes; then
-    LIBSRCS="$LIBSRCS getopt.c"
+       LIBSRCS="$LIBSRCS getopt.c"
+fi
+if test "$ac_cv_func_getpeereid" != yes; then
+       OL_MSGHDR_MSG_ACCRIGHTS
+       LIBSRCS="$LIBSRCS getpeereid.c"
+fi
+if test "$ac_cv_func_snprintf" != yes -o "$ac_cv_func_vsnprintf" != yes; then
+       if test "$ac_cv_func_snprintf" != yes; then
+               AC_DEFINE(snprintf, ber_pvt_snprintf, [define to snprintf routine])
+       fi
+       if test "$ac_cv_func_vsnprintf" != yes; then
+               AC_DEFINE(vsnprintf, ber_pvt_vsnprintf, [define to snprintf routine])
+       fi
  fi
  
  dnl ----------------------------------------------------------------
  fi
  
  dnl ----------------------------------------------------------------
@@ -2295,6 +2516,24 @@ OL_SYS_ERRLIST
  dnl ----------------------------------------------------------------
  dnl Sort out defines
  
  dnl ----------------------------------------------------------------
  dnl Sort out defines
  
+if test "$ol_enable_slapi" != no ; then
+       dnl This check is donel also if --enable-modules is used;
+       dnl it is duplicated here, 'cause it'd be cached anyway
+       AC_CHECK_HEADERS(ltdl.h)
+
+       if test $ac_cv_header_ltdl_h != yes ; then
+               AC_MSG_ERROR([could not locate <ltdl.h>])
+       fi
+       AC_CHECK_LIB(ltdl, lt_dlinit, [
+               SLAPI_LIBS=-lltdl
+               LIBSLAPI=./libslapi.a
+               LIBSLAPITOOLS=../libslapi.a
+               AC_DEFINE(HAVE_LIBLTDL,1,[define if you have libtool -ltdl])
+       ],[AC_MSG_ERROR([could not locate libtool -lltdl])])
+
+       AC_DEFINE(LDAP_SLAPI,1, [define this to add SLAPI code])
+fi
+
  if test "$ol_enable_debug" != no ; then
         AC_DEFINE(LDAP_DEBUG,1,
                 [define this to add debugging code])
  if test "$ol_enable_debug" != no ; then
         AC_DEFINE(LDAP_DEBUG,1,
                 [define this to add debugging code])
@@ -2303,10 +2542,6 @@ if test "$ol_enable_syslog" = yes ; then
         AC_DEFINE(LDAP_SYSLOG,1,
                 [define this to add syslog code])
  fi
         AC_DEFINE(LDAP_SYSLOG,1,
                 [define this to add syslog code])
  fi
-if test "$ol_enable_cache" = no ; then
-       AC_DEFINE(LDAP_NOCACHE,1,
-               [define this to remove -lldap cache support])
-fi
  if test "$ol_link_kbind" != no ; then
         AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND,LDAP_VENDOR_VERSION)
  fi
  if test "$ol_link_kbind" != no ; then
         AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND,LDAP_VENDOR_VERSION)
  fi
@@ -2335,9 +2570,9 @@ fi
  if test "$ol_link_spasswd" != no ; then
         AC_DEFINE(SLAPD_SPASSWD,1,[define to support SASL passwords])
  fi
  if test "$ol_link_spasswd" != no ; then
         AC_DEFINE(SLAPD_SPASSWD,1,[define to support SASL passwords])
  fi
-dnl if test "$ol_enable_multimaster" != no ; then
-dnl    AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication])
-dnl 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,[define to support phonetic])
  fi
  if test "$ol_enable_phonetic" != no ; then
         AC_DEFINE(SLAPD_PHONETIC,1,[define to support phonetic])
  fi
@@ -2363,7 +2598,9 @@ if test "$ol_enable_bdb" != no ; then
                         [define to support dynamic BDB backend])
                 BUILD_BDB=mod
                 BUILD_BDB_DYNAMIC=shared
                         [define to support dynamic BDB backend])
                 BUILD_BDB=mod
                 BUILD_BDB_DYNAMIC=shared
-               SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-bdb/back_bdb.la"
+               SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-bdb"
+       else
+               SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-bdb"
         fi
  fi
  
         fi
  fi
  
@@ -2376,7 +2613,9 @@ if test "$ol_link_dnssrv" != no ; then
                         [define to support dynamic DNS SRV backend])
                 BUILD_DNSSRV=mod
                 BUILD_DNSSRV_DYNAMIC=shared
                         [define to support dynamic DNS SRV backend])
                 BUILD_DNSSRV=mod
                 BUILD_DNSSRV_DYNAMIC=shared
-               SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-dnssrv/back_dnssrv.la"
+               SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-dnssrv"
+       else
+               SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-dnssrv"
         fi
  fi
  
         fi
  fi
  
@@ -2389,7 +2628,9 @@ if test "$ol_enable_ldap" != no ; then
                         [define to support dynamic LDAP backend])
                 BUILD_LDAP=mod
                 BUILD_LDAP_DYNAMIC=shared
                         [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"
+               SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldap"
+       else
+               SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldap"
         fi
  fi
  
         fi
  fi
  
@@ -2397,13 +2638,14 @@ if test "$ol_link_ldbm" != no -a $ol_enable_ldbm != no; then
         AC_DEFINE(SLAPD_LDBM,1,[define to support LDBM backend])
         BUILD_SLAPD=yes
         BUILD_LDBM=yes
         AC_DEFINE(SLAPD_LDBM,1,[define to support LDBM backend])
         BUILD_SLAPD=yes
         BUILD_LDBM=yes
-       LDBM_LIB="-lldbm"
         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
         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"
+               SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldbm"
+       else
+               SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldbm"
         fi
  fi
  
         fi
  fi
  
@@ -2417,12 +2659,16 @@ if test "$ol_enable_meta" != no ; then
         AC_DEFINE(SLAPD_META,1,[define to support LDAP Metadirectory backend])
         BUILD_SLAPD=yes
         BUILD_META=yes
         AC_DEFINE(SLAPD_META,1,[define to support LDAP Metadirectory backend])
         BUILD_SLAPD=yes
         BUILD_META=yes
+       BUILD_LDAP=yes
+       BUILD_REWRITE=yes
         if test "$ol_with_meta_module" != static ; then
                 AC_DEFINE(SLAPD_META_DYNAMIC,1,
                         [define to support dynamic LDAP Metadirectory backend])
                 BUILD_META=mod
                 BUILD_META_DYNAMIC=shared
         if test "$ol_with_meta_module" != static ; then
                 AC_DEFINE(SLAPD_META_DYNAMIC,1,
                         [define to support dynamic LDAP Metadirectory backend])
                 BUILD_META=mod
                 BUILD_META_DYNAMIC=shared
-               SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-meta/back_meta.la"
+               SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-meta"
+       else
+               SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-meta"
         fi
  fi
  
         fi
  fi
  
@@ -2435,7 +2681,24 @@ if test "$ol_enable_monitor" != no ; then
                         [define to support dynamic cn=Monitor backend])
                 BUILD_MONITOR=mod
                 BUILD_MONITOR_DYNAMIC=shared
                         [define to support dynamic cn=Monitor backend])
                 BUILD_MONITOR=mod
                 BUILD_MONITOR_DYNAMIC=shared
-               SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-monitor/back_monitor.la"
+               SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-monitor"
+       else
+               SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-monitor"
+       fi
+fi
+
+if test "$ol_enable_null" != no ; then
+       AC_DEFINE(SLAPD_NULL,1,[define to support NULL backend])
+       BUILD_SLAPD=yes
+       BUILD_NULL=yes
+       if test "$ol_with_null_module" != static ; then
+               AC_DEFINE(SLAPD_NULL_DYNAMIC,1,
+                       [define to support dynamic NULL backend])
+               BUILD_NULL=mod
+               BUILD_NULL_DYNAMIC=shared
+               SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-null"
+       else
+               SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-null"
         fi
  fi
  
         fi
  fi
  
@@ -2448,7 +2711,9 @@ if test "$ol_enable_passwd" != no ; then
                         [define to support dynamic PASSWD backend])
                 BUILD_PASSWD=mod
                 BUILD_PASSWD_DYNAMIC=shared
                         [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"
+               SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-passwd"
+       else
+               SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-passwd"
         fi
  fi
  
         fi
  fi
  
@@ -2461,11 +2726,16 @@ if test "$ol_link_perl" != no ; then
                         [define to support dynamic PERL backend])
                 BUILD_PERL=mod
                 BUILD_PERL_DYNAMIC=shared
                         [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"
+               SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-perl"
+       else
+               SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-perl"
         fi
  fi
  
  if test "$ol_enable_shell" != no ; then
         fi
  fi
  
  if test "$ol_enable_shell" != no ; then
+       if test "$ol_link_thread" != no ; then
+               AC_MSG_WARN([Use of --without-threads is recommended with back-shell])
+       fi
         AC_DEFINE(SLAPD_SHELL,1,[define to support SHELL backend])
         BUILD_SLAPD=yes
         BUILD_SHELL=yes
         AC_DEFINE(SLAPD_SHELL,1,[define to support SHELL backend])
         BUILD_SLAPD=yes
         BUILD_SHELL=yes
@@ -2474,7 +2744,9 @@ if test "$ol_enable_shell" != no ; then
                         [define to support dynamic SHELL backend])
                 BUILD_SHELL=mod
                 BUILD_SHELL_DYNAMIC=shared
                         [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"
+               SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-shell"
+       else
+               SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-shell"
         fi
  fi
  
         fi
  fi
  
@@ -2487,7 +2759,9 @@ if test "$ol_enable_tcl" != no ; then
                         [define to support dynamic TCL backend])
                 BUILD_TCL=mod
                 BUILD_TCL_DYNAMIC=shared
                         [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"
+               SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-tcl"
+       else
+               SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-tcl"
         fi
  fi
  
         fi
  fi
  
@@ -2500,7 +2774,9 @@ if test "$ol_link_sql" != no ; then
                         [define to support dynamic SQL backend])
                 BUILD_SQL=mod
                 BUILD_SQL_DYNAMIC=shared
                         [define to support dynamic SQL backend])
                 BUILD_SQL=mod
                 BUILD_SQL_DYNAMIC=shared
-               SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-sql/back_sql.la"
+               SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-sql"
+       else
+               SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-sql"
         fi
  fi
  
         fi
  fi
  
@@ -2512,41 +2788,48 @@ fi
  if test "$ol_enable_rewrite" != no ; then
         AC_DEFINE(ENABLE_REWRITE,1,[define to enable rewriting in back-ldap and back-meta])
         BUILD_REWRITE=yes
  if test "$ol_enable_rewrite" != no ; then
         AC_DEFINE(ENABLE_REWRITE,1,[define to enable rewriting in back-ldap and back-meta])
         BUILD_REWRITE=yes
-       SLAPD_LIBS="$SLAPD_LIBS -lrewrite"
+fi
+
+if test "$ol_enable_slapi" != no ; then
+       AC_DEFINE(ENABLE_SLAPI,1,[define to enable slapi library])
+       BUILD_SLAPI=yes
+       SLAPD_SLAPI_DEPEND=libslapi.a
  fi
  
  dnl ----------------------------------------------------------------
  
  fi
  
  dnl ----------------------------------------------------------------
  
-if test "$LINK_BINS_DYNAMIC" = yes; then
-    LIB_LINKAGE=DYN
-    LT_LIB_LINKAGE=shared
+dnl
+dnl For Windows build, we don't want to include -dlopen flags.
+dnl They hurt more than they help.
+dnl
+
+if test "$ac_cv_mingw32" = yes ; then
+       PLAT=NT
+       SLAPD_MODULES_LDFLAGS=
  else
  else
-    LIB_LINKAGE=STAT
-    LT_LIB_LINKAGE=static
+       PLAT=UNIX
  fi
  
  fi
  
-if test "$ac_cv_mingw32" = yes ; then
-    PLAT=NT
-    DYN_EXT=dll
+if test -z "$SLAPD_STATIC_BACKENDS"; then
+       SLAPD_NO_STATIC='#'
  else
  else
-    PLAT=UNIX
-    DYN_EXT=so
+       SLAPD_NO_STATIC=
  fi
  
  AC_SUBST(LIBSRCS)
  fi
  
  AC_SUBST(LIBSRCS)
-
  AC_SUBST(PLAT)
  AC_SUBST(PLAT)
-AC_SUBST(LIB_LINKAGE)
-AC_SUBST(LT_LIB_LINKAGE)
-AC_SUBST(DYN_EXT)
+AC_SUBST(BUILD_LIBS_DYNAMIC)
  
  AC_SUBST(BUILD_SLAPD)
  
  AC_SUBST(BUILD_SLAPD)
+  AC_SUBST(BUILD_SLAPI)
+  AC_SUBST(SLAPD_SLAPI_DEPEND)
    AC_SUBST(BUILD_BDB)
    AC_SUBST(BUILD_DNSSRV)
    AC_SUBST(BUILD_LDAP)
    AC_SUBST(BUILD_LDBM)
    AC_SUBST(BUILD_META)
    AC_SUBST(BUILD_MONITOR)
    AC_SUBST(BUILD_BDB)
    AC_SUBST(BUILD_DNSSRV)
    AC_SUBST(BUILD_LDAP)
    AC_SUBST(BUILD_LDBM)
    AC_SUBST(BUILD_META)
    AC_SUBST(BUILD_MONITOR)
+  AC_SUBST(BUILD_NULL)
    AC_SUBST(BUILD_PASSWD)
    AC_SUBST(BUILD_PERL)
    AC_SUBST(BUILD_SHELL)
    AC_SUBST(BUILD_PASSWD)
    AC_SUBST(BUILD_PERL)
    AC_SUBST(BUILD_SHELL)
@@ -2558,6 +2841,7 @@ AC_SUBST(BUILD_SLAPD)
    AC_SUBST(BUILD_LDBM_DYNAMIC)
    AC_SUBST(BUILD_META_DYNAMIC)
    AC_SUBST(BUILD_MONITOR_DYNAMIC)
    AC_SUBST(BUILD_LDBM_DYNAMIC)
    AC_SUBST(BUILD_META_DYNAMIC)
    AC_SUBST(BUILD_MONITOR_DYNAMIC)
+  AC_SUBST(BUILD_NULL_DYNAMIC)
    AC_SUBST(BUILD_PASSWD_DYNAMIC)
    AC_SUBST(BUILD_PERL_DYNAMIC)
    AC_SUBST(BUILD_SHELL_DYNAMIC)
    AC_SUBST(BUILD_PASSWD_DYNAMIC)
    AC_SUBST(BUILD_PERL_DYNAMIC)
    AC_SUBST(BUILD_SHELL_DYNAMIC)
@@ -2565,8 +2849,6 @@ AC_SUBST(BUILD_SLAPD)
    AC_SUBST(BUILD_TCL_DYNAMIC)
  AC_SUBST(BUILD_SLURPD)
  
    AC_SUBST(BUILD_TCL_DYNAMIC)
  AC_SUBST(BUILD_SLURPD)
  
-AC_SUBST(LDBM_LIB)
-
  AC_SUBST(LDAP_LIBS)
  AC_SUBST(LDIF_LIBS)
  AC_SUBST(SLAPD_LIBS)
  AC_SUBST(LDAP_LIBS)
  AC_SUBST(LDIF_LIBS)
  AC_SUBST(SLAPD_LIBS)
@@ -2576,11 +2858,13 @@ AC_SUBST(LTHREAD_LIBS)
  AC_SUBST(LUTIL_LIBS)
  AC_SUBST(WRAP_LIBS)
  AC_SUBST(MOD_TCL_LIB)
  AC_SUBST(LUTIL_LIBS)
  AC_SUBST(WRAP_LIBS)
  AC_SUBST(MOD_TCL_LIB)
-AC_SUBST(LINK_BINS_DYNAMIC)
  
  AC_SUBST(SLAPD_MODULES_CPPFLAGS)
  AC_SUBST(SLAPD_MODULES_LDFLAGS)
  
  AC_SUBST(SLAPD_MODULES_CPPFLAGS)
  AC_SUBST(SLAPD_MODULES_LDFLAGS)
-AC_SUBST(SLAPD_MODULES_LIST)
+
+AC_SUBST(SLAPD_NO_STATIC)
+AC_SUBST(SLAPD_STATIC_BACKENDS)
+AC_SUBST(SLAPD_DYNAMIC_BACKENDS)
  
  AC_SUBST(PERL_CPPFLAGS)
  AC_SUBST(SLAPD_PERL_LDFLAGS)
  
  AC_SUBST(PERL_CPPFLAGS)
  AC_SUBST(SLAPD_PERL_LDFLAGS)
@@ -2593,6 +2877,9 @@ AC_SUBST(SASL_LIBS)
  AC_SUBST(TERMCAP_LIBS)
  AC_SUBST(TLS_LIBS)
  AC_SUBST(MODULES_LIBS)
  AC_SUBST(TERMCAP_LIBS)
  AC_SUBST(TLS_LIBS)
  AC_SUBST(MODULES_LIBS)
+AC_SUBST(SLAPI_LIBS)
+AC_SUBST(LIBSLAPI)
+AC_SUBST(LIBSLAPITOOLS)
  AC_SUBST(AUTH_LIBS)
  
  AC_SUBST(SLAPD_SLP_LIBS)
  AC_SUBST(AUTH_LIBS)
  
  AC_SUBST(SLAPD_SLP_LIBS)
@@ -2601,6 +2888,11 @@ AC_SUBST(SLAPD_SQL_LDFLAGS)
  AC_SUBST(SLAPD_SQL_LIBS)
  AC_SUBST(SLAPD_SQL_INCLUDES)
  
  AC_SUBST(SLAPD_SQL_LIBS)
  AC_SUBST(SLAPD_SQL_INCLUDES)
  
+dnl ----------------------------------------------------------------
+dnl final help output
+AC_ARG_WITH(xxinstall,[
+See INSTALL file for further details.])
+
  dnl ----------------------------------------------------------------
  dnl final output
  dnl
  dnl ----------------------------------------------------------------
  dnl final output
  dnl
@@ -2614,10 +2906,6 @@ 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 \
  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/mail500/Makefile:build/top.mk:clients/mail500/Makefile.in:build/rules.mk \
-clients/ud/Makefile:build/top.mk:clients/ud/Makefile.in:build/rules.mk \
-clients/maildap/Makefile:build/top.mk:clients/maildap/Makefile.in:build/rules.mk \
  clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \
  include/Makefile:build/top.mk:include/Makefile.in \
  libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk     \
  clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \
  include/Makefile:build/top.mk:include/Makefile.in \
  libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk     \
@@ -2629,7 +2917,7 @@ libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib.
  libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk:build/lib-static.mk \
  libraries/liblunicode/Makefile:build/top.mk:libraries/liblunicode/Makefile.in:build/lib.mk:build/lib-static.mk \
  libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk       \
  libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk:build/lib-static.mk \
  libraries/liblunicode/Makefile:build/top.mk:libraries/liblunicode/Makefile.in:build/lib.mk:build/lib-static.mk \
  libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk       \
-libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk    \
+libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk \
  servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk \
  servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \
  servers/slapd/back-bdb/Makefile:build/top.mk:servers/slapd/back-bdb/Makefile.in:build/mod.mk \
  servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk \
  servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \
  servers/slapd/back-bdb/Makefile:build/top.mk:servers/slapd/back-bdb/Makefile.in:build/mod.mk \
@@ -2638,19 +2926,19 @@ servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.i
  servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk \
  servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk \
  servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/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-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk \
  servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk \
+servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/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-sql/Makefile:build/top.mk:servers/slapd/back-sql/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/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-sql/Makefile:build/top.mk:servers/slapd/back-sql/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/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.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:build/dir.mk \
  tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.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: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 \
  ,[
  date > stamp-h
  ,[
  date > stamp-h
-echo Please \"make depend\" to build dependencies
+echo Please run \"make depend\" to build dependencies
  ])
  ])