Allow OpenLDAP to be built without LDBM.

diff --git a/configure b/configure
index ee61a39f976f2e0df22300e3e2399098e75d6e6b..2178735689bbcf2ed59f3877f905d088bb35cd78 100755 (executable)
--- a/configure
+++ b/configure
@@ -14,10 +14,14 @@ ac_default_prefix=/usr/local
 ac_default_prefix=/usr/local
 ac_help="$ac_help
   --enable-debug       enable debugging (yes)"
+ac_help="$ac_help
+  --enable-syslog      enable syslog support (no)"
 ac_help="$ac_help
   --enable-libui       enable library user interface (yes)"
 ac_help="$ac_help
   --enable-cache       enable caching (yes)"
+ac_help="$ac_help
+  --enable-dns enable dns support (no)"
 ac_help="$ac_help
   --enable-referrals   enable referrals (yes)"
 ac_help="$ac_help
@@ -591,7 +595,7 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 echo $ac_n "checking arguments""... $ac_c" 1>&6
-echo "configure:595: checking arguments" >&5
+echo "configure:599: checking arguments" >&5
 
 
 # Check whether --enable-debug or --disable-debug was given.
@@ -608,6 +612,21 @@ else
   enableval=yes 
   LDAP_DEBUG=yes
   
+fi
+# Check whether --enable-syslog or --disable-syslog was given.
+if test "${enable_syslog+set}" = set; then
+  enableval="$enable_syslog"
+  test "$enableval" != yes && enableval=no
+  if test "$enableval" != "no" ; then
+    
+       LDAP_CLDAP=yes 
+  else
+    LDAP_CLDAP=no
+  fi
+else
+  enableval=no 
+  LDAP_CLDAP=no
+  
 fi
 # Check whether --enable-libui or --disable-libui was given.
 if test "${enable_libui+set}" = set; then
@@ -638,6 +657,21 @@ else
   enableval=yes 
   LDAP_CACHE=yes
   
+fi
+# Check whether --enable-dns or --disable-dns was given.
+if test "${enable_dns+set}" = set; then
+  enableval="$enable_dns"
+  test "$enableval" != yes && enableval=no
+  if test "$enableval" != "no" ; then
+    
+       LDAP_DNS=yes 
+  else
+    LDAP_DNS=no
+  fi
+else
+  enableval=no 
+  LDAP_DNS=no
+  
 fi
 # Check whether --enable-referrals or --disable-referrals was given.
 if test "${enable_referrals+set}" = set; then
@@ -948,7 +982,7 @@ fi
 echo "$ac_t""done" 1>&6
 
 echo $ac_n "checking LDBM preferences""... $ac_c" 1>&6
-echo "configure:952: checking LDBM preferences" >&5
+echo "configure:986: checking LDBM preferences" >&5
 ldbm_prefer=any
 
 if test "$opt_ndbm" = yes ; then
@@ -976,15 +1010,21 @@ fi
 ## general LDAP arguments
 LDAP_DEFS=
 LDAP_LIBS=
+LDBM_DEFS=
+LDBM_LIBS=
+LUTIL_DEFS=
+LUTIL_LIBS=
 
 if test "$LDAP_DEBUG" = "yes" ; then
        LDAP_DEFS="$LDAP_DEFS -DLDAP_DEBUG"
 fi
+if test "$LDAP_SYSLOG" = "yes" ; then
+       LDAP_DEFS="$LDAP_DEFS -DLDAP_SYSLOG"
+fi
+if test "$LDAP_DNS" = "yes" ; then
+       LDAP_DEFS="$LDAP_DEFS -DLDAP_DNS"
+fi
 if test "$LDAP_REFERRALS" = "yes" ; then
-       cat >> confdefs.h <<\EOF
-#define LDAP_REFERRALS 1
-EOF
-
        LDAP_DEFS="$LDAP_DEFS -DLDAP_REFERRALS"
 fi
 if test "$LDAP_CACHE" = "no" ; then
@@ -1009,7 +1049,6 @@ LDAPD_LIBS=
 ## slapd arguments
 SLAPD_DEFS=
 SLAPD_LIBS=
-LUTIL_DEFS=
 if test "$SLAPD_PHONETIC" = "yes" ; then
        cat >> confdefs.h <<\EOF
 #define SLAPD_PHONETIC 1
@@ -1026,8 +1065,10 @@ if test "$SLAPD_SHA1" = "yes" ; then
        LUTIL_DEFS="$LUTIL_DEFS -DLDAP_SHA1"
 fi
 
+BUILD_LDBM=no
 if test "$SLAPD_LDBM" = "yes" ; then
-       SLAPD_DEFS="$SLAPD_DEFS -DLDAP_LDBM"
+       BUILD_LDBM=yes
+       LDBM_DEFS="$LDBM_DEFS -DLDAP_LDBM"
 fi
 if test "$SLAPD_PASSWD" = "yes" ; then
        SLAPD_DEFS="$SLAPD_DEFS -DLDAP_PASSWD"
@@ -1043,7 +1084,7 @@ SLURPD_LIBS=
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1047: checking for $ac_word" >&5
+echo "configure:1088: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1072,7 +1113,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1076: checking for $ac_word" >&5
+echo "configure:1117: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1120,7 +1161,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1124: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1165: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1130,11 +1171,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 1134 "configure"
+#line 1175 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1154,12 +1195,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1158: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1199: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1163: checking whether we are using GNU C" >&5
+echo "configure:1204: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1168,7 +1209,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1183,7 +1224,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1187: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1228: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1211,7 +1252,7 @@ else
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1215: checking how to run the C preprocessor" >&5
+echo "configure:1256: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1226,13 +1267,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1230 "configure"
+#line 1271 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1243,13 +1284,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1247 "configure"
+#line 1288 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1273,13 +1314,13 @@ echo "$ac_t""$CPP" 1>&6
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:1277: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:1318: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 1283 "configure"
+#line 1324 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -1297,7 +1338,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 1301 "configure"
+#line 1342 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -1320,7 +1361,7 @@ fi
 
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1324: checking whether ln -s works" >&5
+echo "configure:1365: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1351,7 +1392,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1355: checking for a BSD compatible install" >&5
+echo "configure:1396: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1403,7 +1444,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1407: checking for $ac_word" >&5
+echo "configure:1448: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1430,7 +1471,7 @@ else
 fi
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1434: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1475: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1460,7 +1501,7 @@ fi
 # Extract the first word of "sendmail", so it can be a program name with args.
 set dummy sendmail; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1464: checking for $ac_word" >&5
+echo "configure:1505: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1492,7 +1533,7 @@ fi
 # Extract the first word of "vi", so it can be a program name with args.
 set dummy vi; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1496: checking for $ac_word" >&5
+echo "configure:1537: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_EDITOR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1524,7 +1565,7 @@ fi
 # Extract the first word of "finger", so it can be a program name with args.
 set dummy finger; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1528: checking for $ac_word" >&5
+echo "configure:1569: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_FINGER'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1564,17 +1605,17 @@ else
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1568: checking for $ac_hdr" >&5
+echo "configure:1609: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1573 "configure"
+#line 1614 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1603,13 +1644,13 @@ done
 
        if test "$ac_cv_header_pthread_h" = yes ; then
                                echo $ac_n "checking POSIX thread version""... $ac_c" 1>&6
-echo "configure:1607: checking POSIX thread version" >&5
+echo "configure:1648: checking POSIX thread version" >&5
 if eval "test \"`echo '$''{'cf_cv_pthread_version'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                        cat > conftest.$ac_ext <<EOF
-#line 1613 "configure"
+#line 1654 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -1631,7 +1672,7 @@ rm -f conftest*
 
 
                        cat > conftest.$ac_ext <<EOF
-#line 1635 "configure"
+#line 1676 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -1673,7 +1714,7 @@ echo "$ac_t""$cf_cv_pthread_version" 1>&6
                fi
 
                echo $ac_n "checking for LinuxThreads""... $ac_c" 1>&6
-echo "configure:1677: checking for LinuxThreads" >&5
+echo "configure:1718: checking for LinuxThreads" >&5
 if eval "test \"`echo '$''{'cf_cv_linux_threads'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1695,12 +1736,12 @@ echo "$ac_t""$cf_cv_linux_threads" 1>&6
 
                
                                echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-echo "configure:1699: checking for pthread_create" >&5
+echo "configure:1740: checking for pthread_create" >&5
 if eval "test \"`echo '$''{'ac_cv_func_pthread_create'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1704 "configure"
+#line 1745 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pthread_create(); below.  */
@@ -1723,7 +1764,7 @@ pthread_create();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_pthread_create=yes"
 else
@@ -1746,7 +1787,7 @@ fi
 
                if test $pthread_link = no ; then
                                                echo $ac_n "checking for pthread_create with -pthread""... $ac_c" 1>&6
-echo "configure:1750: checking for pthread_create with -pthread" >&5
+echo "configure:1791: checking for pthread_create with -pthread" >&5
 if eval "test \"`echo '$''{'cf_cv_pthread_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1754,7 +1795,7 @@ else
                                                                save_LIBS="$LIBS"
                                LIBS="-pthread $LIBS"
                                cat > conftest.$ac_ext <<EOF
-#line 1758 "configure"
+#line 1799 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
@@ -1764,7 +1805,7 @@ int main() {
                                        
 ; return 0; }
 EOF
-if { (eval echo configure:1768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_pthread_flag=yes
 else
@@ -1789,7 +1830,7 @@ echo "$ac_t""$cf_cv_pthread_flag" 1>&6
                if test $pthread_link = no ; then
                                                save_LIBS="$LIBS"
                        echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:1793: checking for pthread_create in -lpthread" >&5
+echo "configure:1834: checking for pthread_create in -lpthread" >&5
 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1797,7 +1838,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1801 "configure"
+#line 1842 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1808,7 +1849,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
-if { (eval echo configure:1812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1836,7 +1877,7 @@ fi
                if test $pthread_link = no ; then
                                                save_LIBS="$LIBS"
                        echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:1840: checking for pthread_create in -lc_r" >&5
+echo "configure:1881: checking for pthread_create in -lc_r" >&5
 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1844,7 +1885,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1848 "configure"
+#line 1889 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1855,7 +1896,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
-if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1883,7 +1924,7 @@ fi
                if test $pthread_link = no ; then
                                                save_LIBS="$LIBS"
                        echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:1887: checking for pthread_create in -lpthread" >&5
+echo "configure:1928: checking for pthread_create in -lpthread" >&5
 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1891,7 +1932,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread -lmach -lexc -lc $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1895 "configure"
+#line 1936 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1902,7 +1943,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
-if { (eval echo configure:1906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1933,11 +1974,11 @@ fi
        fi
 fi
 
-# check for strtok_r
+# check for strtok_r (and presumely other reentrant functions)
 save_LIBS="$LIBS"
 LIBS="$save_LIBS $LTHREAD_LIBS"
 echo $ac_n "checking for strtok_r in -lpthread""... $ac_c" 1>&6
-echo "configure:1941: checking for strtok_r in -lpthread" >&5
+echo "configure:1982: checking for strtok_r in -lpthread" >&5
 ac_lib_var=`echo pthread'_'strtok_r | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1945,7 +1986,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1949 "configure"
+#line 1990 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1956,7 +1997,7 @@ int main() {
 strtok_r()
 ; return 0; }
 EOF
-if { (eval echo configure:1960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1985,8 +2026,9 @@ fi
 
 
 if test $ac_cv_lib_pthread_strtok_r = no ; then
+       LIBS="$save_LIBS $LTHREAD_LIBS"
        echo $ac_n "checking for strtok_r in -lc_r""... $ac_c" 1>&6
-echo "configure:1990: checking for strtok_r in -lc_r" >&5
+echo "configure:2032: checking for strtok_r in -lc_r" >&5
 ac_lib_var=`echo c_r'_'strtok_r | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1994,7 +2036,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1998 "configure"
+#line 2040 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2005,7 +2047,7 @@ int main() {
 strtok_r()
 ; return 0; }
 EOF
-if { (eval echo configure:2009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2035,12 +2077,12 @@ fi
        for ac_func in strtok_r sched_yield
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2039: checking for $ac_func" >&5
+echo "configure:2081: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2044 "configure"
+#line 2086 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2063,7 +2105,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2094,12 +2136,12 @@ else
        for ac_func in strtok_r sched_yield
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2098: checking for $ac_func" >&5
+echo "configure:2140: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2103 "configure"
+#line 2145 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2122,7 +2164,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2152,19 +2194,16 @@ LIBS="$save_LIBS"
 
 
 ldbm_use="none"
-LDBM_DEFS=
-LDBM_LIBS=
-
 if test "$SLAPD_LDBM" = "yes" ; then
        if test $ldbm_prefer = any -o $ldbm_prefer = dbbtree \
                        -o $ldbm_prefer = dbhash ; then
                echo $ac_n "checking for dbopen""... $ac_c" 1>&6
-echo "configure:2163: checking for dbopen" >&5
+echo "configure:2202: checking for dbopen" >&5
 if eval "test \"`echo '$''{'ac_cv_func_dbopen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2168 "configure"
+#line 2207 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbopen(); below.  */
@@ -2187,7 +2226,7 @@ dbopen();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbopen=yes"
 else
@@ -2208,7 +2247,7 @@ else
   echo "$ac_t""no" 1>&6
 
                        echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
-echo "configure:2212: checking for dbopen in -ldb" >&5
+echo "configure:2251: checking for dbopen in -ldb" >&5
 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2216,7 +2255,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldb  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2220 "configure"
+#line 2259 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2227,7 +2266,7 @@ int main() {
 dbopen()
 ; return 0; }
 EOF
-if { (eval echo configure:2231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2264,13 +2303,13 @@ fi
                fi
 
                echo $ac_n "checking for db2""... $ac_c" 1>&6
-echo "configure:2268: checking for db2" >&5
+echo "configure:2307: checking for db2" >&5
 if eval "test \"`echo '$''{'cf_cv_db2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                        cat > conftest.$ac_ext <<EOF
-#line 2274 "configure"
+#line 2313 "configure"
 #include "confdefs.h"
 
 #include <db.h>
@@ -2304,17 +2343,17 @@ echo "$ac_t""$cf_cv_db2" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2308: checking for $ac_hdr" >&5
+echo "configure:2347: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2313 "configure"
+#line 2352 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2355,7 +2394,7 @@ done
 
        if test $ldbm_prefer = any -o $ldbm_prefer = gdbm ; then
                echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:2359: checking for gdbm_open in -lgdbm" >&5
+echo "configure:2398: checking for gdbm_open in -lgdbm" >&5
 ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2363,7 +2402,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgdbm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2367 "configure"
+#line 2406 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2374,7 +2413,7 @@ int main() {
 gdbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:2378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2402,7 +2441,7 @@ fi
        fi
        if test $ldbm_prefer = any -o $ldbm_prefer = ndbm ; then
                echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:2406: checking for dbm_open in -ldbm" >&5
+echo "configure:2445: checking for dbm_open in -ldbm" >&5
 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2410,7 +2449,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldbm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2414 "configure"
+#line 2453 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2421,7 +2460,7 @@ int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:2425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2459,7 +2498,7 @@ fi
 
 if test "$SLAPD_TCP_WRAPPERS" = "yes" ; then
        echo $ac_n "checking for hosts_access in -lwrap""... $ac_c" 1>&6
-echo "configure:2463: checking for hosts_access in -lwrap" >&5
+echo "configure:2502: checking for hosts_access in -lwrap" >&5
 ac_lib_var=`echo wrap'_'hosts_access | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2467,7 +2506,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lwrap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2471 "configure"
+#line 2510 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2478,7 +2517,7 @@ int main() {
 hosts_access()
 ; return 0; }
 EOF
-if { (eval echo configure:2482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2510,12 +2549,12 @@ LIBTERMCAP="-ltermcap"
 # FreeBSD (and others) have crypt(3) in -lcrypt
 if test "$SLAPD_CRYPT" = "yes" ; then
        echo $ac_n "checking for crypt""... $ac_c" 1>&6
-echo "configure:2514: checking for crypt" >&5
+echo "configure:2553: checking for crypt" >&5
 if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2519 "configure"
+#line 2558 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char crypt(); below.  */
@@ -2538,7 +2577,7 @@ crypt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_crypt=yes"
 else
@@ -2557,7 +2596,7 @@ else
   echo "$ac_t""no" 1>&6
 
                echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:2561: checking for crypt in -lcrypt" >&5
+echo "configure:2600: checking for crypt in -lcrypt" >&5
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2565,7 +2604,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2569 "configure"
+#line 2608 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2576,7 +2615,7 @@ int main() {
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2613,12 +2652,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:2617: checking for $ac_hdr that defines DIR" >&5
+echo "configure:2656: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2622 "configure"
+#line 2661 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -2626,7 +2665,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:2630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -2651,7 +2690,7 @@ done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:2655: checking for opendir in -ldir" >&5
+echo "configure:2694: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2659,7 +2698,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2663 "configure"
+#line 2702 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2670,7 +2709,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:2674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2692,7 +2731,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:2696: checking for opendir in -lx" >&5
+echo "configure:2735: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2700,7 +2739,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2704 "configure"
+#line 2743 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2711,7 +2750,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:2715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2734,12 +2773,12 @@ fi
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2738: checking for ANSI C header files" >&5
+echo "configure:2777: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2743 "configure"
+#line 2782 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2747,7 +2786,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2764,7 +2803,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2768 "configure"
+#line 2807 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2782,7 +2821,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2786 "configure"
+#line 2825 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2803,7 +2842,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2807 "configure"
+#line 2846 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2814,7 +2853,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:2818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2838,12 +2877,12 @@ EOF
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2842: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2881: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2847 "configure"
+#line 2886 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -2859,7 +2898,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -2895,17 +2934,17 @@ for ac_hdr in \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2899: checking for $ac_hdr" >&5
+echo "configure:2938: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2904 "configure"
+#line 2943 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2933,12 +2972,12 @@ done
 
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:2937: checking for uid_t in sys/types.h" >&5
+echo "configure:2976: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2942 "configure"
+#line 2981 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -2967,7 +3006,7 @@ EOF
 fi
 
 echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:2971: checking type of array argument to getgroups" >&5
+echo "configure:3010: checking type of array argument to getgroups" >&5
 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2975,7 +3014,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat > conftest.$ac_ext <<EOF
-#line 2979 "configure"
+#line 3018 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Rendell for this test.  */
@@ -3000,7 +3039,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:3004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
     ac_cv_type_getgroups=gid_t
 else
@@ -3014,7 +3053,7 @@ fi
 
 if test $ac_cv_type_getgroups = cross; then
         cat > conftest.$ac_ext <<EOF
-#line 3018 "configure"
+#line 3057 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
@@ -3038,12 +3077,12 @@ EOF
 
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3042: checking for mode_t" >&5
+echo "configure:3081: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3047 "configure"
+#line 3086 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3071,12 +3110,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3075: checking for off_t" >&5
+echo "configure:3114: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3080 "configure"
+#line 3119 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3104,12 +3143,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3108: checking for pid_t" >&5
+echo "configure:3147: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3113 "configure"
+#line 3152 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3137,12 +3176,12 @@ EOF
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3141: checking return type of signal handlers" >&5
+echo "configure:3180: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3146 "configure"
+#line 3185 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3159,7 +3198,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3178,12 +3217,12 @@ EOF
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3182: checking for size_t" >&5
+echo "configure:3221: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3187 "configure"
+#line 3226 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3211,12 +3250,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3215: checking for uid_t in sys/types.h" >&5
+echo "configure:3254: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3220 "configure"
+#line 3259 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -3245,12 +3284,12 @@ EOF
 fi
 
 echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:3249: checking for st_blksize in struct stat" >&5
+echo "configure:3288: checking for st_blksize in struct stat" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3254 "configure"
+#line 3293 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -3258,7 +3297,7 @@ int main() {
 struct stat s; s.st_blksize;
 ; return 0; }
 EOF
-if { (eval echo configure:3262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blksize=yes
 else
@@ -3279,12 +3318,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3283: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3322: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3288 "configure"
+#line 3327 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3293,7 +3332,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3314,12 +3353,12 @@ EOF
 fi
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:3318: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:3357: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3323 "configure"
+#line 3362 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -3327,7 +3366,7 @@ int main() {
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:3331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -3349,12 +3388,12 @@ fi
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3353: checking for working const" >&5
+echo "configure:3392: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3358 "configure"
+#line 3397 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3403,7 +3442,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:3407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3425,7 +3464,7 @@ fi
 
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:3429: checking for 8-bit clean memcmp" >&5
+echo "configure:3468: checking for 8-bit clean memcmp" >&5
 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3433,7 +3472,7 @@ else
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3437 "configure"
+#line 3476 "configure"
 #include "confdefs.h"
 
 main()
@@ -3443,7 +3482,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:3447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_memcmp_clean=yes
 else
@@ -3461,12 +3500,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o"
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3465: checking return type of signal handlers" >&5
+echo "configure:3504: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3470 "configure"
+#line 3509 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3483,7 +3522,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3502,12 +3541,12 @@ EOF
 
 
 echo $ac_n "checking for strftime""... $ac_c" 1>&6
-echo "configure:3506: checking for strftime" >&5
+echo "configure:3545: checking for strftime" >&5
 if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3511 "configure"
+#line 3550 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char strftime(); below.  */
@@ -3530,7 +3569,7 @@ strftime();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_strftime=yes"
 else
@@ -3552,7 +3591,7 @@ else
   echo "$ac_t""no" 1>&6
 # strftime is in -lintl on SCO UNIX.
 echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
-echo "configure:3556: checking for strftime in -lintl" >&5
+echo "configure:3595: checking for strftime in -lintl" >&5
 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3560,7 +3599,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3564 "configure"
+#line 3603 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3571,7 +3610,7 @@ int main() {
 strftime()
 ; return 0; }
 EOF
-if { (eval echo configure:3575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3598,12 +3637,12 @@ fi
 fi
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:3602: checking for vprintf" >&5
+echo "configure:3641: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3607 "configure"
+#line 3646 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -3626,7 +3665,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -3650,12 +3689,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:3654: checking for _doprnt" >&5
+echo "configure:3693: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3659 "configure"
+#line 3698 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -3678,7 +3717,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -3703,7 +3742,7 @@ fi
 fi
 
 echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
-echo "configure:3707: checking for wait3 that fills in rusage" >&5
+echo "configure:3746: checking for wait3 that fills in rusage" >&5
 if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3711,7 +3750,7 @@ else
   ac_cv_func_wait3_rusage=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3715 "configure"
+#line 3754 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3742,7 +3781,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:3746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_wait3_rusage=yes
 else
@@ -3783,12 +3822,12 @@ for ac_func in \
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3787: checking for $ac_func" >&5
+echo "configure:3826: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3792 "configure"
+#line 3831 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3811,7 +3850,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3836,15 +3875,15 @@ fi
 done
 
 
-for ac_func in strsep strdup
+for ac_func in strdup
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3843: checking for $ac_func" >&5
+echo "configure:3882: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3848 "configure"
+#line 3887 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3867,7 +3906,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3897,13 +3936,13 @@ done
 # Check Configuration
 
 echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6
-echo "configure:3901: checking declaration of sys_errlist" >&5
+echo "configure:3940: checking declaration of sys_errlist" >&5
 if eval "test \"`echo '$''{'cf_cv_dcl_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
        cat > conftest.$ac_ext <<EOF
-#line 3907 "configure"
+#line 3946 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -3913,7 +3952,7 @@ int main() {
 char *c = (char *) *sys_errlist
 ; return 0; }
 EOF
-if { (eval echo configure:3917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_dcl_sys_errlist=yes
 else
@@ -3934,20 +3973,20 @@ if test $cf_cv_dcl_sys_errlist = no ; then
 EOF
 
        echo $ac_n "checking existence of sys_errlist""... $ac_c" 1>&6
-echo "configure:3938: checking existence of sys_errlist" >&5
+echo "configure:3977: checking existence of sys_errlist" >&5
        if eval "test \"`echo '$''{'cf_cv_have_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                cat > conftest.$ac_ext <<EOF
-#line 3944 "configure"
+#line 3983 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int main() {
 char *c = (char *) *sys_errlist
 ; return 0; }
 EOF
-if { (eval echo configure:3951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_have_sys_errlist=yes
 else
@@ -3965,7 +4004,6 @@ fi
 
 
 
-
   
   
   
@@ -3978,6 +4016,10 @@ fi
 
 
 
+  
+  
+  
+
 
 
 
@@ -4168,9 +4210,9 @@ s%@LIBTERMCAP@%$LIBTERMCAP%g
 s%@LIBOBJS@%$LIBOBJS%g
 s%@BUILD_LDAPD@%$BUILD_LDAPD%g
 s%@BUILD_SLAPD@%$BUILD_SLAPD%g
-s%@SLAPD_LDBM@%$SLAPD_LDBM%g
-s%@SLAPD_PASSWD@%$SLAPD_PASSWD%g
-s%@SLAPD_SHELL@%$SLAPD_SHELL%g
+s%@BUILD_LDBM@%$BUILD_LDBM%g
+s%@BUILD_PASSWD@%$BUILD_PASSWD%g
+s%@BUILD_SHELL@%$BUILD_SHELL%g
 s%@BUILD_SLURPD@%$BUILD_SLURPD%g
 s%@LDAP_DEFS@%$LDAP_DEFS%g
 s%@LDAP_LIBS@%$LDAP_LIBS%g
@@ -4178,6 +4220,9 @@ s%@LDAPD_DEFS@%$LDAPD_DEFS%g
 s%@LDAPD_LIBS@%$LDAPD_LIBS%g
 s%@SLAPD_DEFS@%$SLAPD_DEFS%g
 s%@SLAPD_LIBS@%$SLAPD_LIBS%g
+s%@SLAPD_LDBM@%$SLAPD_LDBM%g
+s%@SLAPD_PASSWD@%$SLAPD_PASSWD%g
+s%@SLAPD_SHELL@%$SLAPD_SHELL%g
 s%@SLURPD_DEFS@%$SLURPD_DEFS%g
 s%@SLURPD_LIBS@%$SLURPD_LIBS%g
 s%@LDBM_DEFS@%$LDBM_DEFS%g

diff --git a/configure.in b/configure.in
index f8f4b55271d936ae2ae934eb117a710314c17a0b..846c08820b18e5841001f90f182f35d8448d1cc8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -24,10 +24,14 @@ AC_PREFIX_DEFAULT(/usr/local)
 dnl General "enable" options
 CF_ARG_OPTION(debug,[  --enable-debug  enable debugging (yes)],[
        LDAP_DEBUG=no],[LDAP_DEBUG=yes],yes)dnl
+CF_ARG_OPTION(syslog,[  --enable-syslog        enable syslog support (no)],[
+       LDAP_CLDAP=yes],[LDAP_CLDAP=no],no)dnl
 CF_ARG_OPTION(libui,[  --enable-libui  enable library user interface (yes)],[
        LDAP_LIBUI=no],[LDAP_LIBUI=yes],yes)dnl
 CF_ARG_OPTION(cache,[  --enable-cache  enable caching (yes)],[
        LDAP_CACHE=no],[LDAP_CACHE=yes],yes)dnl
+CF_ARG_OPTION(dns,[  --enable-dns      enable dns support (no)],[
+       LDAP_DNS=yes],[LDAP_DNS=no],no)dnl
 CF_ARG_OPTION(referrals,[  --enable-referrals  enable referrals (yes)],[
        LDAP_REFERRALS=no],[LDAP_REFERRALS=yes],yes)dnl
 
@@ -119,12 +123,23 @@ fi
 ## general LDAP arguments
 LDAP_DEFS=
 LDAP_LIBS=
+LDBM_DEFS=
+LDBM_LIBS=
+LUTIL_DEFS=
+LUTIL_LIBS=
 
 if test "$LDAP_DEBUG" = "yes" ; then
        LDAP_DEFS="$LDAP_DEFS -DLDAP_DEBUG"
 fi
+if test "$LDAP_SYSLOG" = "yes" ; then
+       LDAP_DEFS="$LDAP_DEFS -DLDAP_SYSLOG"
+fi
+if test "$LDAP_DNS" = "yes" ; then
+dnl    AC_DEFINE(LDAP_DNS,1)
+       LDAP_DEFS="$LDAP_DEFS -DLDAP_DNS"
+fi
 if test "$LDAP_REFERRALS" = "yes" ; then
-       AC_DEFINE(LDAP_REFERRALS,1)
+dnl    AC_DEFINE(LDAP_REFERRALS,1)
        LDAP_DEFS="$LDAP_DEFS -DLDAP_REFERRALS"
 fi
 if test "$LDAP_CACHE" = "no" ; then
@@ -143,7 +158,6 @@ LDAPD_LIBS=
 ## slapd arguments
 SLAPD_DEFS=
 SLAPD_LIBS=
-LUTIL_DEFS=
 if test "$SLAPD_PHONETIC" = "yes" ; then
        AC_DEFINE(SLAPD_PHONETIC,1)
        SLAPD_DEFS="$SLAPD_DEFS -DSOUNDEX"
@@ -159,9 +173,11 @@ dnl        AC_DEFINE(SLAPD_SHA1,1)
        LUTIL_DEFS="$LUTIL_DEFS -DLDAP_SHA1"
 fi
 
+BUILD_LDBM=no
 if test "$SLAPD_LDBM" = "yes" ; then
 dnl    AC_DEFINE(SLAPD_LDBM,1)
-       SLAPD_DEFS="$SLAPD_DEFS -DLDAP_LDBM"
+       BUILD_LDBM=yes
+       LDBM_DEFS="$LDBM_DEFS -DLDAP_LDBM"
 fi
 if test "$SLAPD_PASSWD" = "yes" ; then
 dnl    AC_DEFINE(SLAPD_PASSWD,1)
@@ -313,12 +329,13 @@ dnl                       AC_DEFINE(HAVE_LINUX_THREADS,1)
        fi
 fi
 
-# check for strtok_r
+# check for strtok_r (and presumely other reentrant functions)
 save_LIBS="$LIBS"
 LIBS="$save_LIBS $LTHREAD_LIBS"
 AC_CHECK_LIB(pthread,strtok_r)
 
 if test $ac_cv_lib_pthread_strtok_r = no ; then
+       LIBS="$save_LIBS $LTHREAD_LIBS"
        AC_CHECK_LIB(c_r,strtok_r)
        AC_CHECK_FUNCS(strtok_r sched_yield)
        if test $ac_cv_lib_c_r_strtok_r = yes ; then
@@ -332,9 +349,6 @@ LIBS="$save_LIBS"
 
 
 ldbm_use="none"
-LDBM_DEFS=
-LDBM_LIBS=
-
 if test "$SLAPD_LDBM" = "yes" ; then
        if test $ldbm_prefer = any -o $ldbm_prefer = dbbtree \
                        -o $ldbm_prefer = dbhash ; then
@@ -502,27 +516,30 @@ AC_CHECK_FUNCS(           \
        memcpy                  \
 )
 
-AC_REPLACE_FUNCS(strsep strdup)
+AC_REPLACE_FUNCS(strdup)
 
 dnl ----------------------------------------------------------------
 # Check Configuration
 CF_SYS_ERRLIST
 
+dnl ----------------------------------------------------------------
 AC_SUBST(BUILD_LDAPD)
-
 AC_SUBST(BUILD_SLAPD)
-  AC_SUBST(SLAPD_LDBM)
-  AC_SUBST(SLAPD_PASSWD)
-  AC_SUBST(SLAPD_SHELL)
-
+  AC_SUBST(BUILD_LDBM)
+  AC_SUBST(BUILD_PASSWD)
+  AC_SUBST(BUILD_SHELL)
 AC_SUBST(BUILD_SLURPD)
 
+
 AC_SUBST(LDAP_DEFS)
 AC_SUBST(LDAP_LIBS)
 AC_SUBST(LDAPD_DEFS)
 AC_SUBST(LDAPD_LIBS)
 AC_SUBST(SLAPD_DEFS)
 AC_SUBST(SLAPD_LIBS)
+  AC_SUBST(SLAPD_LDBM)
+  AC_SUBST(SLAPD_PASSWD)
+  AC_SUBST(SLAPD_SHELL)
 AC_SUBST(SLURPD_DEFS)
 AC_SUBST(SLURPD_LIBS)
 AC_SUBST(LDBM_DEFS)
@@ -532,6 +549,10 @@ AC_SUBST(LTHREAD_LIBS)
 AC_SUBST(LUTIL_DEFS)
 AC_SUBST(LUTIL_LIBS)
 
+dnl ----------------------------------------------------------------
+dnl final output
+dnl
+
 dnl AC_OUTPUT( \
 dnl contrib/Makefile:build/top.mk:contrib/Makefile.in:build/dir.mk \
 dnl contrib/saucer/Makefile:build/top.mk:contrib/saucer/Makefile.in:build/rules.mk \

diff --git a/include/portable.h.in b/include/portable.h.in
index 7121fb09364c1be935ae0540ac423a0e81613ff8..4812407c36ac668471353d8e3cf46a4f00f16d52 100644 (file)
--- a/include/portable.h.in
+++ b/include/portable.h.in
@@ -79,9 +79,6 @@
 /* define this to remove -lldap cache support */
 #undef LDAP_NOCACHE
 
-/* define this for LDAP referrals support */
-#undef LDAP_REFERRALS
-
 /* define this for phonetic support */
 #undef SLAPD_PHONETIC
 

diff --git a/libraries/libldbm/ldbm.c b/libraries/libldbm/ldbm.c
index 6d15e4629e8a3f6881c4893eedc2c9eee6f79b57..33bd1888a734161a91c497d079eb4f3baae59f39 100644 (file)
--- a/libraries/libldbm/ldbm.c
+++ b/libraries/libldbm/ldbm.c
@@ -1,5 +1,13 @@
 /* ldbm.c - ldap dbm compatibility routines */
 
+/* Patched for Berkeley DB version 2.0; /KSp; 98/02/23
+ *
+ *   - basic implementation; 1998/02/23, /KSp
+ *   - DB_DBT_MALLOC       ; 1998/03/22, /KSp
+ */
+
+#ifdef LDAP_LDBM
+
 #include <stdio.h>
 #include "ldbm.h"
 
@@ -121,10 +129,41 @@ ldbm_errno( LDBM ldbm )
  *                                                               *
  *****************************************************************/
 
+#ifdef LDBM_USE_DB2
+/*************************************************
+ *                                               *
+ *  A malloc routine for use with DB_DBT_MALLOC  *
+ *                                               *
+ *************************************************/
+
+#include <stdlib.h>
+
+
+void *
+ldbm_malloc( size_t size )
+{
+       return( calloc( 1, size ));
+}
+
+#endif
+
+
 LDBM
 ldbm_open( char *name, int rw, int mode, int dbcachesize )
 {
-       LDBM            ret;
+       LDBM            ret = NULL;
+
+#ifdef LDBM_USE_DB2
+       DB_INFO         dbinfo;
+
+       memset( &dbinfo, 0, sizeof( dbinfo ));
+       dbinfo.db_cachesize = dbcachesize;
+       dbinfo.db_pagesize  = DEFAULT_DB_PAGE_SIZE;
+       dbinfo.db_malloc    = ldbm_malloc;
+
+       db_open( name, DB_TYPE, rw, mode, NULL, &dbinfo, &ret );
+
+#else
        void            *info;
        BTREEINFO       binfo;
        HASHINFO        hinfo;
@@ -140,14 +179,22 @@ ldbm_open( char *name, int rw, int mode, int dbcachesize )
        } else {
                info = NULL;
        }
+
        ret = dbopen( name, rw, mode, DB_TYPE, info );
+
+#endif
+
        return( ret );
 }
 
 void
 ldbm_close( LDBM ldbm )
 {
+#ifdef LDBM_USE_DB2
+       (*ldbm->close)( ldbm, 0 );
+#else
        (*ldbm->close)( ldbm );
+#endif
 }
 
 void
@@ -167,6 +214,10 @@ ldbm_datum_dup( LDBM ldbm, Datum data )
 {
        Datum   dup;
 
+#ifdef LDBM_USE_DB2
+       memset( &dup, 0, sizeof( dup ));
+#endif
+
        if ( data.dsize == 0 ) {
                dup.dsize = 0;
                dup.dptr = NULL;
@@ -186,9 +237,18 @@ ldbm_fetch( LDBM ldbm, Datum key )
        Datum   data;
        int     rc;
 
+#ifdef LDBM_USE_DB2
+       memset( &data, 0, sizeof( data ));
+
+       data.flags = DB_DBT_MALLOC;
+
+       if ( (rc = (*ldbm->get)( ldbm, NULL, &key, &data, 0 )) != 0 ) {
+               if ( data.dptr ) free( data.dptr );
+#else
        if ( (rc = (*ldbm->get)( ldbm, &key, &data, 0 )) == 0 ) {
                data = ldbm_datum_dup( ldbm, data );
        } else {
+#endif
                data.dptr = NULL;
                data.dsize = 0;
        }
@@ -201,7 +261,12 @@ ldbm_store( LDBM ldbm, Datum key, Datum data, int flags )
 {
        int     rc;
 
+#ifdef LDBM_USE_DB2
+       rc = (*ldbm->put)( ldbm, NULL, &key, &data, flags & ~LDBM_SYNC );
+       rc = (-1 ) * rc;
+#else
        rc = (*ldbm->put)( ldbm, &key, &data, flags & ~LDBM_SYNC );
+#endif
        if ( flags & LDBM_SYNC )
                (*ldbm->sync)( ldbm, 0 );
        return( rc );
@@ -212,38 +277,88 @@ ldbm_delete( LDBM ldbm, Datum key )
 {
        int     rc;
 
+#ifdef LDBM_USE_DB2
+       rc = (*ldbm->del)( ldbm, NULL, &key, 0 );
+       rc = (-1 ) * rc;
+#else
        rc = (*ldbm->del)( ldbm, &key, 0 );
+#endif
        (*ldbm->sync)( ldbm, 0 );
        return( rc );
 }
 
 Datum
+#ifdef LDBM_USE_DB2
+ldbm_firstkey( LDBM ldbm, DBC **dbch )
+#else
 ldbm_firstkey( LDBM ldbm )
+#endif
 {
        Datum   key, data;
        int     rc;
 
+#ifdef LDBM_USE_DB2
+       DBC  *dbci;
+
+       memset( &key, 0, sizeof( key ));
+       memset( &data, 0, sizeof( data ));
+
+       key.flags = data.flags = DB_DBT_MALLOC;
+
+       /* acquire a cursor for the DB */
+       if ( (*ldbm->cursor)( ldbm, NULL, &dbci )) {
+               return( key );
+       } else {
+               *dbch = dbci;
+               if ( (*dbci->c_get)( dbci, &key, &data, DB_NEXT ) == 0 ) {
+                       if ( data.dptr ) free( data.dptr );
+#else
        if ( (rc = (*ldbm->seq)( ldbm, &key, &data, R_FIRST )) == 0 ) {
                key = ldbm_datum_dup( ldbm, key );
+#endif
        } else {
                key.dptr = NULL;
                key.dsize = 0;
        }
+
+#ifdef LDBM_USE_DB2
+       }
+#endif
+
        return( key );
 }
 
 Datum
+#ifdef LDBM_USE_DB2
+ldbm_nextkey( LDBM ldbm, Datum key, DBC *dbcp )
+#else
 ldbm_nextkey( LDBM ldbm, Datum key )
+#endif
 {
        Datum   data;
        int     rc;
 
+#ifdef LDBM_USE_DB2
+       void *oldKey = key.dptr;
+
+       memset( &data, 0, sizeof( data ));
+
+       data.flags = DB_DBT_MALLOC;
+
+       if ( (*dbcp->c_get)( dbcp, &key, &data, DB_NEXT ) == 0 ) {
+               if ( data.dptr ) free( data.dptr );
+#else
        if ( (rc = (*ldbm->seq)( ldbm, &key, &data, R_NEXT )) == 0 ) {
                key = ldbm_datum_dup( ldbm, key );
+#endif
        } else {
                key.dptr = NULL;
                key.dsize = 0;
        }
+#ifdef LDBM_USE_DB2
+       if ( oldKey ) free( oldKey );
+#endif
+
        return( key );
 }
 
@@ -346,3 +461,4 @@ ldbm_errno( LDBM ldbm )
 #endif /* ndbm */
 #endif /* db */
 #endif /* gdbm */
+#endif /* ldbm */

diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
index 69726d998870a7e411b7ab3cba292ad9aed2a4bb..5c3127eeb21c2199b9a574c8f8f3f318f53efc26 100644 (file)
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@@ -30,7 +30,16 @@ OBJS2        = ../config.o ../ch_malloc.o ../backend.o ../charray.o \
                ../dn.o ../filter.o ../str2filter.o ../ava.o ../init.o \
                ../schemaparse.o ../strdup.o
 
-all-local: build-edb2ldif build-chlog2replog $(PROGRAMS)
+all-local: build-ldbm build-edb2ldif build-chlog2replog
+
+build-ldbm: FORCE
+       @if [ "$(BUILD_LDBM)" = "yes" ]; then \
+               $(MAKE) $(MFLAGS) ldbm-tools; \
+    else \
+               echo "run configure with --with-ldbm to build LDBM tools"; \
+    fi
+
+ldbm-tools: $(PROGRAMS)
 
 XDEFS = @SLAPD_DEFS@ @LDBM_DEFS@ @LTHREAD_DEFS@
 XLIBS = @SLAPD_LIBS@ -lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ -llutil @LUTIL_LIBS@
@@ -95,21 +104,37 @@ clean-local: FORCE
        $(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) edb2-vers.c *.o a.out core
 
 depend-local: FORCE
-       @if [ "$(HAVE_ISODE)" = "yes" ]; then \
-        DEPENDEXTRAS="$(ISODEINCLUDEFLAG) chlog2replog.c $(EDB2LDIFSRCS)"; \
+       @DEPEND=no ; DEPEND_LDBM= ; DEPEND_ISODE= ;\
+       if [ "$(BUILD_LDBM)" = "yes" ]; then \
+        DEPEND_LDBM="$(SRCS)"; \
+               DEPEND=yes ; \
+    fi; \
+       if [ "$(HAVE_ISODE)" = "yes" ]; then \
+        DEPEND_ISODE="$(ISODEINCLUDEFLAG) chlog2replog.c $(EDB2LDIFSRCS)"; \
+               DEPEND=yes ; \
     fi; \
-    $(MKDEP) $(DEFS) $(DEFINES) $$DEPENDEXTRAS $(SRCS)
+       if [ "$$DEPEND" = "yes" ]; then \
+       $(MKDEP) $(DEFS) $(DEFINES) $$DEPEND_ISODE $$DEPEND_LDBM \
+       else \
+               exit 0 ; \
+       fi
+
+install-local: install-ldbm install-isode FORCE
 
-install-local: install-isode FORCE
+install-ldbm: FORCE
        @-$(MKDIR) -p $(sbindir)
-       $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(sbindir)
-       $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(sbindir)
-       $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(sbindir)
-       $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(sbindir)
-       $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(sbindir)
-       $(INSTALL) $(INSTALLFLAGS) -m 755 ldif $(sbindir)
-       $(INSTALL) $(INSTALLFLAGS) -m 755 centipede $(sbindir)
-       $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(sbindir)
+       @if [ "$(BUILD_LDBM)" = "yes" ]; then \
+               $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(sbindir)  \
+               $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(sbindir) \
+               $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(sbindir)      \
+               $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(sbindir)   \
+               $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(sbindir)    \
+               $(INSTALL) $(INSTALLFLAGS) -m 755 ldif $(sbindir)       \
+               $(INSTALL) $(INSTALLFLAGS) -m 755 centipede $(sbindir)  \
+               $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(sbindir)   \
+       else \
+               exit 0; \
+       fi
 
 install-isode: FORCE
        @-$(MKDIR) -p $(sbindir)