From e2fa599482298372de6545b552b6b3a5ebd20ecb Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sun, 25 Jun 2000 22:01:42 +0000 Subject: [PATCH] Move old files to the Attic --- clients/tools/ldapdelete.dsw | 74 -- clients/tools/ldapmodify.dsw | 104 --- clients/tools/ldapmodrdn.dsw | 74 -- clients/tools/ldappasswd.dsw | 74 -- clients/tools/ldapsearch.dsw | 101 -- clients/ud/ud.dsw | 89 -- configure | 1423 ++++++++++++++--------------- doc/man/man8/centipede.8 | 162 ---- doc/man/man8/chlog2replog.8 | 110 --- doc/man/man8/edb2ldif.8 | 107 --- doc/man/man8/ldif.8 | 56 -- include/portable.h.in | 3 - libraries/libavl/libavl.dsw | 29 - libraries/libavl/testavl.dsw | 44 - libraries/liblber/dtest.dsw | 44 - libraries/liblber/etest.dsw | 44 - libraries/liblber/idtest.dsw | 44 - libraries/liblber/liblber.dsw | 29 - libraries/libldap/apitest.dsw | 59 -- libraries/libldap/libldap.dsw | 29 - libraries/libldap/ltest.dsw | 74 -- libraries/libldap_r/apitest_r.dsw | 59 -- libraries/libldap_r/libldap_r.dsw | 29 - libraries/libldap_r/ltest.dsw | 74 -- libraries/libldap_r/ltest_r.dsw | 74 -- libraries/libldif/libldif.dsw | 29 - libraries/liblutil/liblutil.dsw | 29 - libraries/liblutil/passwd.dsw | 44 - servers/slapd/slapd.dsw | 167 ---- servers/slapd/tools/Makefile.in | 58 +- servers/slapd/tools/centipede.c | 1026 --------------------- servers/slapd/tools/ldbmtest.c | 796 ---------------- servers/slapd/tools/ldbmtest.dsp | 148 --- servers/slapd/tools/ldbmtest.dsw | 29 - servers/slapd/tools/ldif.c | 103 --- servers/slapd/tools/ldif.dsp | 145 --- servers/slapd/tools/ldif.dsw | 59 -- servers/slapd/tools/sizecount.c | 190 ---- servers/slurpd/slurpd.dsw | 53 -- 39 files changed, 677 insertions(+), 5208 deletions(-) delete mode 100644 clients/tools/ldapdelete.dsw delete mode 100644 clients/tools/ldapmodify.dsw delete mode 100644 clients/tools/ldapmodrdn.dsw delete mode 100644 clients/tools/ldappasswd.dsw delete mode 100644 clients/tools/ldapsearch.dsw delete mode 100644 clients/ud/ud.dsw delete mode 100644 doc/man/man8/centipede.8 delete mode 100644 doc/man/man8/chlog2replog.8 delete mode 100644 doc/man/man8/edb2ldif.8 delete mode 100644 doc/man/man8/ldif.8 delete mode 100644 libraries/libavl/libavl.dsw delete mode 100644 libraries/libavl/testavl.dsw delete mode 100644 libraries/liblber/dtest.dsw delete mode 100644 libraries/liblber/etest.dsw delete mode 100644 libraries/liblber/idtest.dsw delete mode 100644 libraries/liblber/liblber.dsw delete mode 100644 libraries/libldap/apitest.dsw delete mode 100644 libraries/libldap/libldap.dsw delete mode 100644 libraries/libldap/ltest.dsw delete mode 100644 libraries/libldap_r/apitest_r.dsw delete mode 100644 libraries/libldap_r/libldap_r.dsw delete mode 100644 libraries/libldap_r/ltest.dsw delete mode 100644 libraries/libldap_r/ltest_r.dsw delete mode 100644 libraries/libldif/libldif.dsw delete mode 100644 libraries/liblutil/liblutil.dsw delete mode 100644 libraries/liblutil/passwd.dsw delete mode 100644 servers/slapd/slapd.dsw delete mode 100644 servers/slapd/tools/centipede.c delete mode 100644 servers/slapd/tools/ldbmtest.c delete mode 100644 servers/slapd/tools/ldbmtest.dsp delete mode 100644 servers/slapd/tools/ldbmtest.dsw delete mode 100644 servers/slapd/tools/ldif.c delete mode 100644 servers/slapd/tools/ldif.dsp delete mode 100644 servers/slapd/tools/ldif.dsw delete mode 100644 servers/slapd/tools/sizecount.c delete mode 100644 servers/slurpd/slurpd.dsw diff --git a/clients/tools/ldapdelete.dsw b/clients/tools/ldapdelete.dsw deleted file mode 100644 index 48462a373e..0000000000 --- a/clients/tools/ldapdelete.dsw +++ /dev/null @@ -1,74 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ldapdelete"=.\ldapdelete.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency - Begin Project Dependency - Project_Dep_Name libldap - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblutil - End Project Dependency -}}} - -############################################################################### - -Project: "liblber"=..\..\libraries\liblber\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldap"=..\..\libraries\libldap\libldap.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "liblutil"=..\..\libraries\liblutil\liblutil.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/clients/tools/ldapmodify.dsw b/clients/tools/ldapmodify.dsw deleted file mode 100644 index 7c38c08844..0000000000 --- a/clients/tools/ldapmodify.dsw +++ /dev/null @@ -1,104 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ldapmodify"=.\ldapmodify.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency - Begin Project Dependency - Project_Dep_Name libldap - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblutil - End Project Dependency - Begin Project Dependency - Project_Dep_Name libldif - End Project Dependency -}}} - -############################################################################### - -Project: "liblber"=..\..\libraries\liblber\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldap"=..\..\libraries\libldap\libldap.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency -}}} - -############################################################################### - -Project: "libldif"=..\..\libraries\libldif\libldif.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "liblutil"=..\..\libraries\liblutil\liblutil.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "setup"=..\..\include\setup.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/clients/tools/ldapmodrdn.dsw b/clients/tools/ldapmodrdn.dsw deleted file mode 100644 index 8514026638..0000000000 --- a/clients/tools/ldapmodrdn.dsw +++ /dev/null @@ -1,74 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ldapmodrdn"=.\ldapmodrdn.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency - Begin Project Dependency - Project_Dep_Name libldap - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblutil - End Project Dependency -}}} - -############################################################################### - -Project: "liblber"=..\..\libraries\liblber\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldap"=..\..\libraries\libldap\libldap.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "liblutil"=..\..\libraries\liblutil\liblutil.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/clients/tools/ldappasswd.dsw b/clients/tools/ldappasswd.dsw deleted file mode 100644 index 861278ccb3..0000000000 --- a/clients/tools/ldappasswd.dsw +++ /dev/null @@ -1,74 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ldappasswd"=.\ldappasswd.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency - Begin Project Dependency - Project_Dep_Name libldap - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblutil - End Project Dependency -}}} - -############################################################################### - -Project: "liblber"=..\..\libraries\liblber\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldap"=..\..\libraries\libldap\libldap.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "liblutil"=..\..\libraries\liblutil\liblutil.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/clients/tools/ldapsearch.dsw b/clients/tools/ldapsearch.dsw deleted file mode 100644 index b611123557..0000000000 --- a/clients/tools/ldapsearch.dsw +++ /dev/null @@ -1,101 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ldapsearch"=.\ldapsearch.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency - Begin Project Dependency - Project_Dep_Name libldap - End Project Dependency - Begin Project Dependency - Project_Dep_Name libldif - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblutil - End Project Dependency -}}} - -############################################################################### - -Project: "liblber"=..\..\libraries\liblber\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldap"=..\..\libraries\libldap\libldap.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldif"=..\..\libraries\libldif\libldif.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "liblutil"=..\..\libraries\liblutil\liblutil.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "setup"=..\..\include\setup.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/clients/ud/ud.dsw b/clients/ud/ud.dsw deleted file mode 100644 index 873331beab..0000000000 --- a/clients/ud/ud.dsw +++ /dev/null @@ -1,89 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "liblber"=..\..\libraries\liblber\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldap"=..\..\libraries\libldap\libldap.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldif"=..\..\libraries\libldif\libldif.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "liblutil"=..\..\libraries\liblutil\liblutil.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ud"=.\ud.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency - Begin Project Dependency - Project_Dep_Name libldap - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblutil - End Project Dependency - Begin Project Dependency - Project_Dep_Name libldif - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/configure b/configure index 48a8e67b27..9ee0c9f66b 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # $OpenLDAP$ -# from OpenLDAP: pkg/ldap/configure.in,v 1.315 2000/06/18 17:36:48 kurt Exp +# from OpenLDAP: pkg/ldap/configure.in,v 1.316 2000/06/25 19:40:13 kurt Exp # Copyright 1998-2000 The OpenLDAP Foundation. All Rights Reserved. # @@ -78,8 +78,6 @@ ac_help="$ac_help --enable-multimaster enable multimaster replication (no)" ac_help="$ac_help --enable-phonetic enable phonetic/soundex (no)" -ac_help="$ac_help - --enable-quipu build quipu migration tools (no)" ac_help="$ac_help --enable-rlookups enable reverse lookups (auto)" ac_help="$ac_help @@ -684,7 +682,7 @@ echo "Configuring OpenLDAP $OL_VERSION ..." echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:688: checking host system type" >&5 +echo "configure:686: checking host system type" >&5 if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then # Make sure we can run config.sub. @@ -725,7 +723,7 @@ host_os=$ac_cv_host_os echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:729: checking target system type" >&5 +echo "configure:727: checking target system type" >&5 if test "x$ac_cv_target" = "x" || (test "x$target" != "xNONE" && test "x$target" != "x$ac_cv_target_alias"); then # Make sure we can run config.sub. @@ -765,7 +763,7 @@ target_os=$ac_cv_target_os echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:769: checking build system type" >&5 +echo "configure:767: checking build system type" >&5 if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then # Make sure we can run config.sub. @@ -842,7 +840,7 @@ test "$host_alias" != "$target_alias" && # 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:846: checking for a BSD compatible install" >&5 +echo "configure:844: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"\${ac_cv_path_install+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -899,7 +897,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:903: checking whether build environment is sane" >&5 +echo "configure:901: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -960,7 +958,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:964: checking for $ac_word" >&5 +echo "configure:962: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_AWK+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -990,7 +988,7 @@ test -n "$AWK" && break done echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:994: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:992: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1030,7 +1028,7 @@ fi missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1034: checking for working aclocal" >&5 +echo "configure:1032: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1043,7 +1041,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1047: checking for working autoconf" >&5 +echo "configure:1045: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1056,7 +1054,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1060: checking for working automake" >&5 +echo "configure:1058: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1069,7 +1067,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1073: checking for working autoheader" >&5 +echo "configure:1071: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1082,7 +1080,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1086: checking for working makeinfo" >&5 +echo "configure:1084: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1102,7 +1100,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1106: checking for $ac_word" >&5 +echo "configure:1104: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_AMTAR+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1153,7 +1151,7 @@ EOF echo $ac_n "checking configure arguments""... $ac_c" 1>&6 -echo "configure:1157: checking configure arguments" >&5 +echo "configure:1155: checking configure arguments" >&5 top_builddir=`pwd` @@ -1696,26 +1694,6 @@ else ol_enable_phonetic="no" fi # end --enable-phonetic -# OpenLDAP --enable-quipu - # Check whether --enable-quipu or --disable-quipu was given. -if test "${enable_quipu+set}" = set; then - enableval="$enable_quipu" - - ol_arg=invalid - for ol_val in auto yes no ; do - if test "$enableval" = "$ol_val" ; then - ol_arg="$ol_val" - fi - done - if test "$ol_arg" = "invalid" ; then - { echo "configure: error: bad value $enableval for --enable-quipu" 1>&2; exit 1; } - fi - ol_enable_quipu="$ol_arg" - -else - ol_enable_quipu="no" -fi -# end --enable-quipu # OpenLDAP --enable-rlookups # Check whether --enable-rlookups or --disable-rlookups was given. if test "${enable_rlookups+set}" = set; then @@ -2287,9 +2265,6 @@ if test $ol_enable_slapd = no ; then if test $ol_enable_phonetic = yes ; then echo "configure: warning: slapd disabled, ignoring --enable-phonetic argument" 1>&2 fi - if test $ol_enable_quipu = yes ; then - echo "configure: warning: slapd disabled, ignoring --enable-quipu argument" 1>&2 - fi if test $ol_enable_rlookups = yes ; then echo "configure: warning: slapd disabled, ignoring --enable-rlookups argument" 1>&2 fi @@ -2343,7 +2318,6 @@ if test $ol_enable_slapd = no ; then ol_enable_modules=no ol_enable_multimaster=no ol_enable_phonetic=no - ol_enable_quipu=no ol_enable_rlookups=no ol_enable_aci=no ol_enable_wrappers=no @@ -2440,14 +2414,12 @@ LDBM_LIBS= LTHREAD_LIBS= LUTIL_LIBS= -QUIPU_LIBS= SLAPD_LIBS= SLURPD_LIBS= BUILD_SLAPD=no BUILD_SLURPD=no -BUILD_QUIPU=no BUILD_THREAD=no BUILD_DNSSRV=no @@ -2516,7 +2488,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2520: checking for $ac_word" >&5 +echo "configure:2492: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2568,7 +2540,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2572: checking for $ac_word" >&5 +echo "configure:2544: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2628,7 +2600,7 @@ fi # 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:2632: checking for $ac_word" >&5 +echo "configure:2604: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_RANLIB+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2658,7 +2630,7 @@ fi # 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:2662: checking for $ac_word" >&5 +echo "configure:2634: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2688,7 +2660,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:2692: checking for $ac_word" >&5 +echo "configure:2664: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2739,7 +2711,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2743: checking for $ac_word" >&5 +echo "configure:2715: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2771,7 +2743,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2775: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 +echo "configure:2747: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2782,12 +2754,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2786 "configure" +#line 2758 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 @@ -2813,12 +2785,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 $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2817: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2789: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $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:2822: checking whether we are using GNU C" >&5 +echo "configure:2794: checking whether we are using GNU C" >&5 if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2827,7 +2799,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2831: \"$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:2803: \"$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 @@ -2846,7 +2818,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2850: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2822: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2889,7 +2861,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:2893: checking for ld used by GCC" >&5 +echo "configure:2865: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -2913,10 +2885,10 @@ echo "configure:2893: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:2917: checking for GNU ld" >&5 +echo "configure:2889: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:2920: checking for non-GNU ld" >&5 +echo "configure:2892: checking for non-GNU ld" >&5 fi if eval "test \"\${ac_cv_path_LD+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2951,7 +2923,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:2955: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:2927: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"\${ac_cv_prog_gnu_ld+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2967,7 +2939,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:2971: checking for BSD-compatible nm" >&5 +echo "configure:2943: checking for BSD-compatible nm" >&5 if eval "test \"\${ac_cv_path_NM+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3003,7 +2975,7 @@ NM="$ac_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:3007: checking whether ln -s works" >&5 +echo "configure:2979: checking whether ln -s works" >&5 if eval "test \"\${ac_cv_prog_LN_S+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3058,8 +3030,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" case "$lt_target" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3062 "configure"' > conftest.$ac_ext - if { (eval echo configure:3063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 3034 "configure"' > conftest.$ac_ext + if { (eval echo configure:3035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -3080,19 +3052,19 @@ case "$lt_target" in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:3084: checking whether the C compiler needs -belf" >&5 +echo "configure:3056: checking whether the C compiler needs -belf" >&5 if eval "test \"\${lt_cv_cc_needs_belf+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -3115,7 +3087,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3119: checking for $ac_word" >&5 +echo "configure:3091: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_DLLTOOL+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3147,7 +3119,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3151: checking for $ac_word" >&5 +echo "configure:3123: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_DLLTOOL+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3182,7 +3154,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3186: checking for $ac_word" >&5 +echo "configure:3158: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_AS+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3214,7 +3186,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3218: checking for $ac_word" >&5 +echo "configure:3190: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_AS+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3249,7 +3221,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3253: checking for $ac_word" >&5 +echo "configure:3225: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_OBJDUMP+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3281,7 +3253,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3285: checking for $ac_word" >&5 +echo "configure:3257: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_OBJDUMP+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3349,7 +3321,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3353: checking for $ac_word" >&5 +echo "configure:3325: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_AWK+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3380,7 +3352,7 @@ done # test for ln hardlink support echo $ac_n "checking whether ln works""... $ac_c" 1>&6 -echo "configure:3384: checking whether ln works" >&5 +echo "configure:3356: checking whether ln works" >&5 if eval "test \"\${ol_cv_prog_LN_H+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3403,7 +3375,7 @@ else fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:3407: checking whether ln -s works" >&5 +echo "configure:3379: checking whether ln -s works" >&5 if eval "test \"\${ac_cv_prog_LN_S+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3431,7 +3403,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:3435: checking for $ac_word" >&5 +echo "configure:3407: checking for $ac_word" >&5 if eval "test \"\${ac_cv_path_SENDMAIL+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3467,7 +3439,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:3471: checking for $ac_word" >&5 +echo "configure:3443: checking for $ac_word" >&5 if eval "test \"\${ac_cv_path_EDITOR+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3503,7 +3475,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:3507: checking for $ac_word" >&5 +echo "configure:3479: checking for $ac_word" >&5 if eval "test \"\${ac_cv_path_FINGER+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3542,7 +3514,7 @@ if test $ol_enable_perl != no ; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3546: checking for $ac_word" >&5 +echo "configure:3518: checking for $ac_word" >&5 if eval "test \"\${ac_cv_path_PERLBIN+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3593,7 +3565,7 @@ fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:3597: checking how to run the C preprocessor" >&5 +echo "configure:3569: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3608,13 +3580,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3625,13 +3597,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3642,13 +3614,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3686,9 +3658,9 @@ elif test $cross_compiling = yes -a $ol_enable_x_compile = no; then fi echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:3690: checking for AIX" >&5 +echo "configure:3662: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:3714: checking for POSIXized ISC" >&5 +echo "configure:3686: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -3732,17 +3704,17 @@ fi ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:3736: checking for minix/config.h" >&5 +echo "configure:3708: checking for minix/config.h" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3781,12 +3753,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:3785: checking for Cygwin environment" >&5 +echo "configure:3757: checking for Cygwin environment" >&5 if eval "test \"\${ac_cv_cygwin+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -3813,19 +3785,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:3817: checking for mingw32 environment" >&5 +echo "configure:3789: checking for mingw32 environment" >&5 if eval "test \"\${ac_cv_mingw32+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -3841,19 +3813,19 @@ echo "$ac_t""$ac_cv_mingw32" 1>&6 MINGW32= test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for EMX OS/2 environment""... $ac_c" 1>&6 -echo "configure:3845: checking for EMX OS/2 environment" >&5 +echo "configure:3817: checking for EMX OS/2 environment" >&5 if eval "test \"\${ac_cv_emxos2+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_emxos2=yes else @@ -3872,7 +3844,7 @@ test "$ac_cv_emxos2" = yes && EMXOS2=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:3876: checking for executable suffix" >&5 +echo "configure:3848: checking for executable suffix" >&5 if eval "test \"\${ac_cv_exeext+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3882,7 +3854,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:3886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:3858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.C | *.o | *.obj | *.xcoff) ;; @@ -3903,13 +3875,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:3907: checking for object suffix" >&5 +echo "configure:3879: checking for object suffix" >&5 if eval "test \"\${ac_cv_objext+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:3913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -3933,7 +3905,7 @@ EOF echo $ac_n "checking for be_app in -lbe""... $ac_c" 1>&6 -echo "configure:3937: checking for be_app in -lbe" >&5 +echo "configure:3909: checking for be_app in -lbe" >&5 ac_lib_var=`echo be'_'be_app | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3941,7 +3913,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbe -lroot -lnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3978,7 +3950,7 @@ fi echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:3982: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:3954: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"\${am_cv_prog_cc_stdc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3995,7 +3967,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" cat > conftest.$ac_ext < #include @@ -4032,7 +4004,7 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ; return 0; } EOF -if { (eval echo configure:4036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_prog_cc_stdc="$ac_arg"; break else @@ -4066,7 +4038,7 @@ if test -z "${MKDEP}"; then OL_MKDEP="${CC-cc}" if test -z "${MKDEP_FLAGS}"; then echo $ac_n "checking for ${OL_MKDEP} depend flag""... $ac_c" 1>&6 -echo "configure:4070: checking for ${OL_MKDEP} depend flag" >&5 +echo "configure:4042: checking for ${OL_MKDEP} depend flag" >&5 if eval "test \"\${ol_cv_mkdep+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4076,7 +4048,7 @@ else cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } \ + if { ac_try='$OL_MKDEP $flag conftest.c'; { (eval echo configure:4052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \ | egrep '^conftest\.'"${ac_objext}" >/dev/null 2>&1 then if test ! -f conftest."${ac_object}" ; then @@ -4109,7 +4081,7 @@ if test "${ol_cv_mkdep}" = no ; then fi echo $ac_n "checking for afopen in -ls""... $ac_c" 1>&6 -echo "configure:4113: checking for afopen in -ls" >&5 +echo "configure:4085: checking for afopen in -ls" >&5 ac_lib_var=`echo s'_'afopen | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4117,7 +4089,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ls $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4159,12 +4131,12 @@ fi for ac_func in getaddrinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4163: checking for $ac_func" >&5 +echo "configure:4135: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4225,17 +4197,17 @@ if test $ol_enable_unix != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4229: checking for $ac_hdr" >&5 +echo "configure:4201: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4275,17 +4247,17 @@ if test $ol_enable_modules != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4279: checking for $ac_hdr" >&5 +echo "configure:4251: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4317,7 +4289,7 @@ done fi echo $ac_n "checking for lt_dlinit in -lltdl""... $ac_c" 1>&6 -echo "configure:4321: checking for lt_dlinit in -lltdl" >&5 +echo "configure:4293: checking for lt_dlinit in -lltdl" >&5 ac_lib_var=`echo ltdl'_'lt_dlinit | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4325,7 +4297,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lltdl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4380,13 +4352,13 @@ fi # test for EBCDIC echo $ac_n "checking for EBCDIC""... $ac_c" 1>&6 -echo "configure:4384: checking for EBCDIC" >&5 +echo "configure:4356: checking for EBCDIC" >&5 if eval "test \"\${ol_cv_cpp_ebcdic+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4419,12 +4391,12 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4423: checking for ANSI C header files" >&5 +echo "configure:4395: checking for ANSI C header files" >&5 if eval "test \"\${ol_cv_header_stdc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4432,7 +4404,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4449,7 +4421,7 @@ rm -f conftest* if test $ol_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4467,7 +4439,7 @@ fi if test $ol_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4488,7 +4460,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #ifndef HAVE_EBCDIC @@ -4506,7 +4478,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:4510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4540,12 +4512,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:4544: checking for $ac_hdr that defines DIR" >&5 +echo "configure:4516: checking for $ac_hdr that defines DIR" >&5 if eval "test \"\${ac_cv_header_dirent_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -4553,7 +4525,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:4557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -4578,7 +4550,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:4582: checking for opendir in -ldir" >&5 +echo "configure:4554: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4586,7 +4558,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4619,7 +4591,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:4623: checking for opendir in -lx" >&5 +echo "configure:4595: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4627,7 +4599,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4661,12 +4633,12 @@ fi fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:4665: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:4637: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"\${ac_cv_header_sys_wait_h+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4682,7 +4654,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:4686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -4703,12 +4675,12 @@ EOF fi echo $ac_n "checking POSIX termios""... $ac_c" 1>&6 -echo "configure:4707: checking POSIX termios" >&5 +echo "configure:4679: checking POSIX termios" >&5 if eval "test \"\${am_cv_sys_posix_termios+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4718,7 +4690,7 @@ int main() { tcgetattr(0, 0); ; return 0; } EOF -if { (eval echo configure:4722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_sys_posix_termios=yes else @@ -4734,7 +4706,7 @@ echo "$ac_t""$am_cv_sys_posix_termios" 1>&6 echo $ac_n "checking whether use of TIOCGWINSZ requires sys/ioctl.h""... $ac_c" 1>&6 -echo "configure:4738: checking whether use of TIOCGWINSZ requires sys/ioctl.h" >&5 +echo "configure:4710: checking whether use of TIOCGWINSZ requires sys/ioctl.h" >&5 if eval "test \"\${am_cv_sys_tiocgwinsz_needs_sys_ioctl_h+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4743,7 +4715,7 @@ else gwinsz_in_termios_h=no if test $am_cv_sys_posix_termios = yes; then cat > conftest.$ac_ext < # include @@ -4763,7 +4735,7 @@ rm -f conftest* if test $gwinsz_in_termios_h = no; then cat > conftest.$ac_ext < # include @@ -4846,17 +4818,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:4850: checking for $ac_hdr" >&5 +echo "configure:4822: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4886,7 +4858,7 @@ done echo $ac_n "checking for sigset in -lV3""... $ac_c" 1>&6 -echo "configure:4890: checking for sigset in -lV3" >&5 +echo "configure:4862: checking for sigset in -lV3" >&5 ac_lib_var=`echo V3'_'sigset | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4894,7 +4866,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lV3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4935,12 +4907,12 @@ fi if test $ac_cv_header_winsock_h = yes; then echo $ac_n "checking for winsock""... $ac_c" 1>&6 -echo "configure:4939: checking for winsock" >&5 +echo "configure:4911: checking for winsock" >&5 if eval "test \"\${ol_cv_winsock+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -4952,7 +4924,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_winsock=yes else @@ -4980,12 +4952,12 @@ fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:4984: checking for socket" >&5 +echo "configure:4956: checking for socket" >&5 if eval "test \"\${ac_cv_func_socket+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -5028,7 +5000,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:5032: checking for main in -lsocket" >&5 +echo "configure:5004: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5036,14 +5008,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5071,7 +5043,7 @@ else fi echo $ac_n "checking for main in -lnet""... $ac_c" 1>&6 -echo "configure:5075: checking for main in -lnet" >&5 +echo "configure:5047: checking for main in -lnet" >&5 ac_lib_var=`echo net'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5079,14 +5051,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5114,7 +5086,7 @@ else fi echo $ac_n "checking for main in -lnsl_s""... $ac_c" 1>&6 -echo "configure:5118: checking for main in -lnsl_s" >&5 +echo "configure:5090: checking for main in -lnsl_s" >&5 ac_lib_var=`echo nsl_s'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5122,14 +5094,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5157,7 +5129,7 @@ else fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:5161: checking for main in -lnsl" >&5 +echo "configure:5133: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5165,14 +5137,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5200,7 +5172,7 @@ else fi echo $ac_n "checking for socket in -linet""... $ac_c" 1>&6 -echo "configure:5204: checking for socket in -linet" >&5 +echo "configure:5176: checking for socket in -linet" >&5 ac_lib_var=`echo inet'_'socket | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5208,7 +5180,7 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5247,7 +5219,7 @@ else fi echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6 -echo "configure:5251: checking for main in -lgen" >&5 +echo "configure:5223: checking for main in -lgen" >&5 ac_lib_var=`echo gen'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5255,14 +5227,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5294,12 +5266,12 @@ fi echo $ac_n "checking for select""... $ac_c" 1>&6 -echo "configure:5298: checking for select" >&5 +echo "configure:5270: checking for select" >&5 if eval "test \"\${ac_cv_func_select+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_select=yes" else @@ -5346,7 +5318,7 @@ fi if test "${ac_cv_header_winsock_h}" != yes; then echo $ac_n "checking types of arguments for select()""... $ac_c" 1>&6 -echo "configure:5350: checking types of arguments for select()" >&5 +echo "configure:5322: checking types of arguments for select()" >&5 if eval "test \"\${ac_cv_func_select_arg234+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5360,7 +5332,7 @@ else for ac_cv_func_select_arg1 in 'int' 'size_t' 'unsigned long' 'unsigned'; do for ac_cv_func_select_arg5 in 'struct timeval *' 'const struct timeval *'; do cat > conftest.$ac_ext < @@ -5379,7 +5351,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_not_found=no ; break 3 else @@ -5424,17 +5396,17 @@ for ac_hdr in regex.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5428: checking for $ac_hdr" >&5 +echo "configure:5400: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5464,12 +5436,12 @@ if test "$ac_cv_header_regex_h" != yes ; then { echo "configure: error: POSIX regex.h required." 1>&2; exit 1; } fi echo $ac_n "checking for regfree""... $ac_c" 1>&6 -echo "configure:5468: checking for regfree" >&5 +echo "configure:5440: checking for regfree" >&5 if eval "test \"\${ac_cv_func_regfree+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_regfree=yes" else @@ -5516,7 +5488,7 @@ fi echo $ac_n "checking for compatible POSIX regex""... $ac_c" 1>&6 -echo "configure:5520: checking for compatible POSIX regex" >&5 +echo "configure:5492: checking for compatible POSIX regex" >&5 if eval "test \"\${ol_cv_c_posix_regex+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5525,7 +5497,7 @@ else ol_cv_c_posix_regex=cross else cat > conftest.$ac_ext < @@ -5551,7 +5523,7 @@ main() return rc; } EOF -if { (eval echo configure:5555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_c_posix_regex=yes else @@ -5573,12 +5545,12 @@ fi ol_link_dnssrv=no echo $ac_n "checking for res_query""... $ac_c" 1>&6 -echo "configure:5577: checking for res_query" >&5 +echo "configure:5549: checking for res_query" >&5 if eval "test \"\${ac_cv_func_res_query+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_res_query=yes" else @@ -5623,7 +5595,7 @@ fi if test $ac_cv_func_res_query = no ; then echo $ac_n "checking for res_query in -lbind""... $ac_c" 1>&6 -echo "configure:5627: checking for res_query in -lbind" >&5 +echo "configure:5599: checking for res_query in -lbind" >&5 ac_lib_var=`echo bind'_'res_query | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5631,7 +5603,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5674,7 +5646,7 @@ fi if test $ac_cv_func_res_query = no ; then echo $ac_n "checking for __res_query in -lbind""... $ac_c" 1>&6 -echo "configure:5678: checking for __res_query in -lbind" >&5 +echo "configure:5650: checking for __res_query in -lbind" >&5 ac_lib_var=`echo bind'_'__res_query | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5682,7 +5654,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5725,7 +5697,7 @@ fi if test $ac_cv_func_res_query = no ; then echo $ac_n "checking for res_query in -lresolv""... $ac_c" 1>&6 -echo "configure:5729: checking for res_query in -lresolv" >&5 +echo "configure:5701: checking for res_query in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_query | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5733,7 +5705,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5789,57 +5761,6 @@ if test "$ol_enable_dnssrv" = yes -a "$ol_link_dnssrv" = no ; then { echo "configure: error: DNSSRV requires res_query()" 1>&2; exit 1; } fi -if test $ol_enable_quipu != no ; then - for ac_hdr in quipu/commonarg.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5798: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done - - - if test $ac_cv_header_quipu_commonarg_h = yes ; then - BUILD_QUIPU=yes - elif test $ol_enable_quipu = auto ; then - echo "configure: warning: no quipu for --enable-quipu=auto, disabling" 1>&2 - else - { echo "configure: error: no quipu for --enable-quipu=$ol_enable_quipu" 1>&2; exit 1; } - fi -fi - ol_link_kbind=no ol_link_kpasswd=no ol_link_krb5=no @@ -5852,17 +5773,17 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5856: checking for $ac_hdr" >&5 +echo "configure:5777: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5894,17 +5815,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5898: checking for $ac_hdr" >&5 +echo "configure:5819: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5938,7 +5859,7 @@ done if test $krb5_impl = mit; then echo $ac_n "checking for main in -lkrb5""... $ac_c" 1>&6 -echo "configure:5942: checking for main in -lkrb5" >&5 +echo "configure:5863: checking for main in -lkrb5" >&5 ac_lib_var=`echo krb5'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5946,14 +5867,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb5 -lcrypto -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5978,7 +5899,7 @@ fi elif test $krb5_impl = heimdal; then echo $ac_n "checking for main in -lkrb5""... $ac_c" 1>&6 -echo "configure:5982: checking for main in -lkrb5" >&5 +echo "configure:5903: checking for main in -lkrb5" >&5 ac_lib_var=`echo krb5'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5986,14 +5907,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb5 -ldes -lasn1 -lroken -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6055,17 +5976,17 @@ if test $ol_link_krb5 = yes -a \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6059: checking for $ac_hdr" >&5 +echo "configure:5980: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6095,7 +6016,7 @@ done if test $ac_cv_header_kerberosIV_krb_h = yes ; then if test $krb5_impl = mit; then echo $ac_n "checking for main in -lkrb4""... $ac_c" 1>&6 -echo "configure:6099: checking for main in -lkrb4" >&5 +echo "configure:6020: checking for main in -lkrb4" >&5 ac_lib_var=`echo krb4'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6103,14 +6024,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6135,7 +6056,7 @@ fi elif test $krb5_impl = heimdal; then echo $ac_n "checking for main in -lkrb4""... $ac_c" 1>&6 -echo "configure:6139: checking for main in -lkrb4" >&5 +echo "configure:6060: checking for main in -lkrb4" >&5 ac_lib_var=`echo krb4'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6143,14 +6064,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb4 -lkrb5 -ldes -lasn1 -lroken -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6192,7 +6113,7 @@ EOF echo $ac_n "checking for des_debug in Kerberos libraries""... $ac_c" 1>&6 -echo "configure:6196: checking for des_debug in Kerberos libraries" >&5 +echo "configure:6117: checking for des_debug in Kerberos libraries" >&5 if eval "test \"\${ol_cv_var_des_debug+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6200,7 +6121,7 @@ else save_LIBS="$LIBS" LIBS="$KRB4_LIBS $KRB5_LIBS $LIBS" cat > conftest.$ac_ext < @@ -6213,7 +6134,7 @@ des_debug = 1; ; return 0; } EOF -if { (eval echo configure:6217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_var_des_debug=yes else @@ -6252,17 +6173,17 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6256: checking for $ac_hdr" >&5 +echo "configure:6177: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6291,7 +6212,7 @@ done if test $ac_cv_header_krb_h = yes ; then echo $ac_n "checking for main in -lkrb""... $ac_c" 1>&6 -echo "configure:6295: checking for main in -lkrb" >&5 +echo "configure:6216: checking for main in -lkrb" >&5 ac_lib_var=`echo krb'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6299,14 +6220,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb -ldes $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6370,17 +6291,17 @@ if test $ol_with_tls != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6374: checking for $ac_hdr" >&5 +echo "configure:6295: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6409,7 +6330,7 @@ done if test $ac_cv_header_openssl_ssl_h = yes -o $ac_cv_header_ssl_h = yes ; then echo $ac_n "checking for SSLeay_add_ssl_algorithms in -lssl""... $ac_c" 1>&6 -echo "configure:6413: checking for SSLeay_add_ssl_algorithms in -lssl" >&5 +echo "configure:6334: checking for SSLeay_add_ssl_algorithms in -lssl" >&5 ac_lib_var=`echo ssl'_'SSLeay_add_ssl_algorithms | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6417,7 +6338,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl -lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6453,7 +6374,7 @@ fi if test $have_ssleay = no ; then echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6 -echo "configure:6457: checking for SSL_library_init in -lssl" >&5 +echo "configure:6378: checking for SSL_library_init in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_library_init | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6461,7 +6382,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl -lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6498,7 +6419,7 @@ fi if test $have_ssleay = no ; then echo $ac_n "checking for ssl3_accept in -lssl""... $ac_c" 1>&6 -echo "configure:6502: checking for ssl3_accept in -lssl" >&5 +echo "configure:6423: checking for ssl3_accept in -lssl" >&5 ac_lib_var=`echo ssl'_'ssl3_accept | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6506,7 +6427,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl -lcrypto -lRSAglue -lrsaref $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6577,12 +6498,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6581: checking for $ac_func" >&5 +echo "configure:6502: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6635,19 +6556,19 @@ if test "$ac_cv_func_ctime_r" = no ; then ol_cv_func_ctime_r_nargs=0 else echo $ac_n "checking number of arguments of ctime_r""... $ac_c" 1>&6 -echo "configure:6639: checking number of arguments of ctime_r" >&5 +echo "configure:6560: checking number of arguments of ctime_r" >&5 if eval "test \"\${ol_cv_func_ctime_r_nargs+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { time_t ti; char *buffer; ctime_r(&ti,buffer,32); ; return 0; } EOF -if { (eval echo configure:6651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_ctime_r_nargs3=yes else @@ -6659,14 +6580,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { time_t ti; char *buffer; ctime_r(&ti,buffer); ; return 0; } EOF -if { (eval echo configure:6670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_ctime_r_nargs2=yes else @@ -6706,12 +6627,12 @@ fi if test "$ac_cv_func_gethostbyname_r" = yes ; then echo $ac_n "checking number of arguments of gethostbyname_r""... $ac_c" 1>&6 -echo "configure:6710: checking number of arguments of gethostbyname_r" >&5 +echo "configure:6631: checking number of arguments of gethostbyname_r" >&5 if eval "test \"\${ol_cv_func_gethostbyname_r_nargs+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6725,7 +6646,7 @@ struct hostent hent; char buffer[BUFSIZE]; buffer, bufsize, &h_errno); ; return 0; } EOF -if { (eval echo configure:6729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_gethostbyname_r_nargs5=yes else @@ -6737,7 +6658,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < #include @@ -6752,7 +6673,7 @@ struct hostent hent;struct hostent *rhent; &rhent, &h_errno); ; return 0; } EOF -if { (eval echo configure:6756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_gethostbyname_r_nargs6=yes else @@ -6793,12 +6714,12 @@ fi if test "$ac_cv_func_gethostbyaddr_r" = yes ; then echo $ac_n "checking number of arguments of gethostbyaddr_r""... $ac_c" 1>&6 -echo "configure:6797: checking number of arguments of gethostbyaddr_r" >&5 +echo "configure:6718: checking number of arguments of gethostbyaddr_r" >&5 if eval "test \"\${ol_cv_func_gethostbyaddr_r_nargs+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6814,7 +6735,7 @@ struct hostent hent; char buffer[BUFSIZE]; alen, AF_INET, &hent, buffer, bufsize, &h_errno); ; return 0; } EOF -if { (eval echo configure:6818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_gethostbyaddr_r_nargs7=yes else @@ -6826,7 +6747,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < #include @@ -6844,7 +6765,7 @@ struct hostent hent; &rhent, &h_errno); ; return 0; } EOF -if { (eval echo configure:6848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_gethostbyaddr_r_nargs8=yes else @@ -6907,18 +6828,18 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ echo $ac_n "checking for NT Threads""... $ac_c" 1>&6 -echo "configure:6911: checking for NT Threads" >&5 +echo "configure:6832: checking for NT Threads" >&5 if eval "test \"\${ol_cv_nt_threads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for _beginthread""... $ac_c" 1>&6 -echo "configure:6917: checking for _beginthread" >&5 +echo "configure:6838: checking for _beginthread" >&5 if eval "test \"\${ac_cv_func__beginthread+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__beginthread=yes" else @@ -7002,17 +6923,17 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7006: checking for $ac_hdr" >&5 +echo "configure:6927: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7041,13 +6962,13 @@ done if test $ac_cv_header_pthread_h = yes ; then echo $ac_n "checking POSIX thread version""... $ac_c" 1>&6 -echo "configure:7045: checking POSIX thread version" >&5 +echo "configure:6966: checking POSIX thread version" >&5 if eval "test \"\${ol_cv_pthread_version+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -7069,7 +6990,7 @@ rm -f conftest* cat > conftest.$ac_ext < @@ -7122,12 +7043,12 @@ EOF echo $ac_n "checking for LinuxThreads pthread.h""... $ac_c" 1>&6 -echo "configure:7126: checking for LinuxThreads pthread.h" >&5 +echo "configure:7047: checking for LinuxThreads pthread.h" >&5 if eval "test \"\${ol_cv_header_linux_threads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -7154,12 +7075,12 @@ EOF echo $ac_n "checking for GNU Pth pthread.h""... $ac_c" 1>&6 -echo "configure:7158: checking for GNU Pth pthread.h" >&5 +echo "configure:7079: checking for GNU Pth pthread.h" >&5 if eval "test \"\${ol_cv_header_gnu_pth_pthread_h+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef _POSIX_THREAD_IS_GNU_PTH @@ -7188,17 +7109,17 @@ echo "$ac_t""$ol_cv_header_gnu_pth_pthread_h" 1>&6 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7192: checking for $ac_hdr" >&5 +echo "configure:7113: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7228,14 +7149,14 @@ done echo $ac_n "checking for pthread_create in default libraries""... $ac_c" 1>&6 -echo "configure:7232: checking for pthread_create in default libraries" >&5 +echo "configure:7153: checking for pthread_create in default libraries" >&5 if eval "test \"\${ol_cv_pthread_create+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -7291,7 +7212,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_create=yes else @@ -7303,7 +7224,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -7364,7 +7285,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:7368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_create=yes else @@ -7389,7 +7310,7 @@ echo "$ac_t""$ol_cv_pthread_create" 1>&6 if test "$ol_link_threads" = no ; then # try -kthread echo $ac_n "checking for pthread link with -kthread""... $ac_c" 1>&6 -echo "configure:7393: checking for pthread link with -kthread" >&5 +echo "configure:7314: checking for pthread link with -kthread" >&5 if eval "test \"\${ol_cv_pthread_kthread+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7400,7 +7321,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -7456,7 +7377,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_kthread=yes else @@ -7468,7 +7389,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -7529,7 +7450,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:7533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_kthread=yes else @@ -7559,7 +7480,7 @@ fi if test "$ol_link_threads" = no ; then # try -pthread echo $ac_n "checking for pthread link with -pthread""... $ac_c" 1>&6 -echo "configure:7563: checking for pthread link with -pthread" >&5 +echo "configure:7484: checking for pthread link with -pthread" >&5 if eval "test \"\${ol_cv_pthread_pthread+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7570,7 +7491,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -7626,7 +7547,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_pthread=yes else @@ -7638,7 +7559,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -7699,7 +7620,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:7703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_pthread=yes else @@ -7729,7 +7650,7 @@ fi if test "$ol_link_threads" = no ; then # try -pthreads echo $ac_n "checking for pthread link with -pthreads""... $ac_c" 1>&6 -echo "configure:7733: checking for pthread link with -pthreads" >&5 +echo "configure:7654: checking for pthread link with -pthreads" >&5 if eval "test \"\${ol_cv_pthread_pthreads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7740,7 +7661,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -7796,7 +7717,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_pthreads=yes else @@ -7808,7 +7729,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -7869,7 +7790,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:7873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_pthreads=yes else @@ -7899,7 +7820,7 @@ fi if test "$ol_link_threads" = no ; then # try -mthreads echo $ac_n "checking for pthread link with -mthreads""... $ac_c" 1>&6 -echo "configure:7903: checking for pthread link with -mthreads" >&5 +echo "configure:7824: checking for pthread link with -mthreads" >&5 if eval "test \"\${ol_cv_pthread_mthreads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7910,7 +7831,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -7966,7 +7887,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_mthreads=yes else @@ -7978,7 +7899,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8039,7 +7960,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_mthreads=yes else @@ -8069,7 +7990,7 @@ fi if test "$ol_link_threads" = no ; then # try -thread echo $ac_n "checking for pthread link with -thread""... $ac_c" 1>&6 -echo "configure:8073: checking for pthread link with -thread" >&5 +echo "configure:7994: checking for pthread link with -thread" >&5 if eval "test \"\${ol_cv_pthread_thread+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8080,7 +8001,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8136,7 +8057,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_thread=yes else @@ -8148,7 +8069,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8209,7 +8130,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_thread=yes else @@ -8240,7 +8161,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthread -lmach -lexc -lc_r echo $ac_n "checking for pthread link with -lpthread -lmach -lexc -lc_r""... $ac_c" 1>&6 -echo "configure:8244: checking for pthread link with -lpthread -lmach -lexc -lc_r" >&5 +echo "configure:8165: checking for pthread link with -lpthread -lmach -lexc -lc_r" >&5 if eval "test \"\${ol_cv_pthread_lpthread_lmach_lexc_lc_r+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8251,7 +8172,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8307,7 +8228,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthread_lmach_lexc_lc_r=yes else @@ -8319,7 +8240,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8380,7 +8301,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lpthread_lmach_lexc_lc_r=yes else @@ -8410,7 +8331,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthread -lmach -lexc echo $ac_n "checking for pthread link with -lpthread -lmach -lexc""... $ac_c" 1>&6 -echo "configure:8414: checking for pthread link with -lpthread -lmach -lexc" >&5 +echo "configure:8335: checking for pthread link with -lpthread -lmach -lexc" >&5 if eval "test \"\${ol_cv_pthread_lpthread_lmach_lexc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8421,7 +8342,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8477,7 +8398,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthread_lmach_lexc=yes else @@ -8489,7 +8410,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8550,7 +8471,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lpthread_lmach_lexc=yes else @@ -8581,7 +8502,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthread -Wl,-woff,85 echo $ac_n "checking for pthread link with -lpthread -Wl,-woff,85""... $ac_c" 1>&6 -echo "configure:8585: checking for pthread link with -lpthread -Wl,-woff,85" >&5 +echo "configure:8506: checking for pthread link with -lpthread -Wl,-woff,85" >&5 if eval "test \"\${ol_cv_pthread_lib_lpthread_woff+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8592,7 +8513,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8648,7 +8569,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lib_lpthread_woff=yes else @@ -8660,7 +8581,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8721,7 +8642,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lib_lpthread_woff=yes else @@ -8752,7 +8673,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthread echo $ac_n "checking for pthread link with -lpthread""... $ac_c" 1>&6 -echo "configure:8756: checking for pthread link with -lpthread" >&5 +echo "configure:8677: checking for pthread link with -lpthread" >&5 if eval "test \"\${ol_cv_pthread_lpthread+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8763,7 +8684,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8819,7 +8740,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthread=yes else @@ -8831,7 +8752,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8892,7 +8813,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lpthread=yes else @@ -8922,7 +8843,7 @@ fi if test "$ol_link_threads" = no ; then # try -lc_r echo $ac_n "checking for pthread link with -lc_r""... $ac_c" 1>&6 -echo "configure:8926: checking for pthread link with -lc_r" >&5 +echo "configure:8847: checking for pthread link with -lc_r" >&5 if eval "test \"\${ol_cv_pthread_lc_r+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8933,7 +8854,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8989,7 +8910,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lc_r=yes else @@ -9001,7 +8922,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9062,7 +8983,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lc_r=yes else @@ -9093,7 +9014,7 @@ fi if test "$ol_link_threads" = no ; then # try -threads echo $ac_n "checking for pthread link with -threads""... $ac_c" 1>&6 -echo "configure:9097: checking for pthread link with -threads" >&5 +echo "configure:9018: checking for pthread link with -threads" >&5 if eval "test \"\${ol_cv_pthread_threads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9104,7 +9025,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -9160,7 +9081,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_threads=yes else @@ -9172,7 +9093,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9233,7 +9154,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_threads=yes else @@ -9264,7 +9185,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthreads -lmach -lexc -lc_r echo $ac_n "checking for pthread link with -lpthreads -lmach -lexc -lc_r""... $ac_c" 1>&6 -echo "configure:9268: checking for pthread link with -lpthreads -lmach -lexc -lc_r" >&5 +echo "configure:9189: checking for pthread link with -lpthreads -lmach -lexc -lc_r" >&5 if eval "test \"\${ol_cv_pthread_lpthreads_lmach_lexc_lc_r+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9275,7 +9196,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -9331,7 +9252,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthreads_lmach_lexc_lc_r=yes else @@ -9343,7 +9264,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9404,7 +9325,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lpthreads_lmach_lexc_lc_r=yes else @@ -9434,7 +9355,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthreads -lmach -lexc echo $ac_n "checking for pthread link with -lpthreads -lmach -lexc""... $ac_c" 1>&6 -echo "configure:9438: checking for pthread link with -lpthreads -lmach -lexc" >&5 +echo "configure:9359: checking for pthread link with -lpthreads -lmach -lexc" >&5 if eval "test \"\${ol_cv_pthread_lpthreads_lmach_lexc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9445,7 +9366,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -9501,7 +9422,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthreads_lmach_lexc=yes else @@ -9513,7 +9434,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9574,7 +9495,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lpthreads_lmach_lexc=yes else @@ -9604,7 +9525,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthreads -lexc echo $ac_n "checking for pthread link with -lpthreads -lexc""... $ac_c" 1>&6 -echo "configure:9608: checking for pthread link with -lpthreads -lexc" >&5 +echo "configure:9529: checking for pthread link with -lpthreads -lexc" >&5 if eval "test \"\${ol_cv_pthread_lpthreads_lexc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9615,7 +9536,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -9671,7 +9592,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthreads_lexc=yes else @@ -9683,7 +9604,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9744,7 +9665,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lpthreads_lexc=yes else @@ -9775,7 +9696,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthreads echo $ac_n "checking for pthread link with -lpthreads""... $ac_c" 1>&6 -echo "configure:9779: checking for pthread link with -lpthreads" >&5 +echo "configure:9700: checking for pthread link with -lpthreads" >&5 if eval "test \"\${ol_cv_pthread_lib_lpthreads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9786,7 +9707,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -9842,7 +9763,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lib_lpthreads=yes else @@ -9854,7 +9775,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9915,7 +9836,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lib_lpthreads=yes else @@ -9957,12 +9878,12 @@ EOF for ac_func in sched_yield pthread_yield do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9961: checking for $ac_func" >&5 +echo "configure:9882: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10014,7 +9935,7 @@ done if test $ac_cv_func_sched_yield = no -a \ $ac_cv_func_pthread_yield = no ; then echo $ac_n "checking for sched_yield in -lrt""... $ac_c" 1>&6 -echo "configure:10018: checking for sched_yield in -lrt" >&5 +echo "configure:9939: checking for sched_yield in -lrt" >&5 ac_lib_var=`echo rt'_'sched_yield | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10022,7 +9943,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10065,12 +9986,12 @@ fi for ac_func in thr_yield do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10069: checking for $ac_func" >&5 +echo "configure:9990: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10128,12 +10049,12 @@ done for ac_func in pthread_kill pthread_rwlock_destroy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10132: checking for $ac_func" >&5 +echo "configure:10053: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10183,13 +10104,13 @@ done echo $ac_n "checking for pthread_detach with ""... $ac_c" 1>&6 -echo "configure:10187: checking for pthread_detach with " >&5 +echo "configure:10108: checking for pthread_detach with " >&5 if eval "test \"\${ol_cv_func_pthread_detach+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -10201,7 +10122,7 @@ int main() { pthread_detach(NULL); ; return 0; } EOF -if { (eval echo configure:10205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_func_pthread_detach=yes else @@ -10233,12 +10154,12 @@ EOF do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10237: checking for $ac_func" >&5 +echo "configure:10158: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10291,12 +10212,12 @@ done for ac_func in pthread_kill_other_threads_np do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10295: checking for $ac_func" >&5 +echo "configure:10216: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10345,7 +10266,7 @@ fi done echo $ac_n "checking for LinuxThreads implementation""... $ac_c" 1>&6 -echo "configure:10349: checking for LinuxThreads implementation" >&5 +echo "configure:10270: checking for LinuxThreads implementation" >&5 if eval "test \"\${ol_cv_sys_linux_threads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10358,7 +10279,7 @@ echo "$ac_t""$ol_cv_sys_linux_threads" 1>&6 echo $ac_n "checking for LinuxThreads consistency""... $ac_c" 1>&6 -echo "configure:10362: checking for LinuxThreads consistency" >&5 +echo "configure:10283: checking for LinuxThreads consistency" >&5 if eval "test \"\${ol_cv_linux_threads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10383,7 +10304,7 @@ echo "$ac_t""$ol_cv_linux_threads" 1>&6 fi echo $ac_n "checking if pthread_create() works""... $ac_c" 1>&6 -echo "configure:10387: checking if pthread_create() works" >&5 +echo "configure:10308: checking if pthread_create() works" >&5 if eval "test \"\${ol_cv_pthread_create_works+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10392,7 +10313,7 @@ else ol_cv_pthread_create_works=yes else cat > conftest.$ac_ext < @@ -10453,7 +10374,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:10457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_create_works=yes else @@ -10475,7 +10396,7 @@ echo "$ac_t""$ol_cv_pthread_create_works" 1>&6 if test $ol_with_yielding_select = auto ; then echo $ac_n "checking if select yields when using pthreads""... $ac_c" 1>&6 -echo "configure:10479: checking if select yields when using pthreads" >&5 +echo "configure:10400: checking if select yields when using pthreads" >&5 if eval "test \"\${ol_cv_pthread_select_yields+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10484,7 +10405,7 @@ else ol_cv_pthread_select_yields=cross else cat > conftest.$ac_ext < @@ -10560,7 +10481,7 @@ int main(argc, argv) exit(2); } EOF -if { (eval echo configure:10564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_select_yields=no else @@ -10604,17 +10525,17 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10608: checking for $ac_hdr" >&5 +echo "configure:10529: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10644,12 +10565,12 @@ done ol_with_threads=found echo $ac_n "checking for cthread_fork""... $ac_c" 1>&6 -echo "configure:10648: checking for cthread_fork" >&5 +echo "configure:10569: checking for cthread_fork" >&5 if eval "test \"\${ac_cv_func_cthread_fork+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_cthread_fork=yes" else @@ -10695,7 +10616,7 @@ fi if test $ol_link_threads = no ; then echo $ac_n "checking for cthread_fork with -all_load""... $ac_c" 1>&6 -echo "configure:10699: checking for cthread_fork with -all_load" >&5 +echo "configure:10620: checking for cthread_fork with -all_load" >&5 if eval "test \"\${ol_cv_cthread_all_load+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10703,7 +10624,7 @@ else save_LIBS="$LIBS" LIBS="-all_load $LIBS" cat > conftest.$ac_ext < int main() { @@ -10712,7 +10633,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_cthread_all_load=yes else @@ -10757,17 +10678,17 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10761: checking for $ac_hdr" >&5 +echo "configure:10682: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10796,7 +10717,7 @@ done if test $ac_cv_header_pth_h = yes ; then echo $ac_n "checking for pth_version in -lpth""... $ac_c" 1>&6 -echo "configure:10800: checking for pth_version in -lpth" >&5 +echo "configure:10721: checking for pth_version in -lpth" >&5 ac_lib_var=`echo pth'_'pth_version | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10804,7 +10725,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpth $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10859,17 +10780,17 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10863: checking for $ac_hdr" >&5 +echo "configure:10784: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10897,7 +10818,7 @@ done if test $ac_cv_header_thread_h = yes -a $ac_cv_header_synch_h = yes ; then echo $ac_n "checking for thr_create in -lthread""... $ac_c" 1>&6 -echo "configure:10901: checking for thr_create in -lthread" >&5 +echo "configure:10822: checking for thr_create in -lthread" >&5 ac_lib_var=`echo thread'_'thr_create | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10905,7 +10826,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10956,12 +10877,12 @@ EOF do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10960: checking for $ac_func" >&5 +echo "configure:10881: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11016,17 +10937,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11020: checking for $ac_hdr" >&5 +echo "configure:10941: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11054,7 +10975,7 @@ done if test $ac_cv_header_lwp_lwp_h = yes ; then echo $ac_n "checking for lwp_create in -llwp""... $ac_c" 1>&6 -echo "configure:11058: checking for lwp_create in -llwp" >&5 +echo "configure:10979: checking for lwp_create in -llwp" >&5 ac_lib_var=`echo lwp'_'lwp_create | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11062,7 +10983,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llwp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11126,17 +11047,17 @@ if test $ol_with_threads = manual ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11130: checking for $ac_hdr" >&5 +echo "configure:11051: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11061: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11165,12 +11086,12 @@ done for ac_func in sched_yield pthread_yield do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11169: checking for $ac_func" >&5 +echo "configure:11090: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11220,12 +11141,12 @@ done echo $ac_n "checking for LinuxThreads pthread.h""... $ac_c" 1>&6 -echo "configure:11224: checking for LinuxThreads pthread.h" >&5 +echo "configure:11145: checking for LinuxThreads pthread.h" >&5 if eval "test \"\${ol_cv_header_linux_threads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -11255,17 +11176,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11259: checking for $ac_hdr" >&5 +echo "configure:11180: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11295,17 +11216,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11299: checking for $ac_hdr" >&5 +echo "configure:11220: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11335,17 +11256,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11339: checking for $ac_hdr" >&5 +echo "configure:11260: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11404,20 +11325,20 @@ EOF echo $ac_n "checking for thread specific errno""... $ac_c" 1>&6 -echo "configure:11408: checking for thread specific errno" >&5 +echo "configure:11329: checking for thread specific errno" >&5 if eval "test \"\${ol_cv_errno_thread_specific+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { errno = 0; ; return 0; } EOF -if { (eval echo configure:11421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_errno_thread_specific=yes else @@ -11433,20 +11354,20 @@ fi echo "$ac_t""$ol_cv_errno_thread_specific" 1>&6 echo $ac_n "checking for thread specific h_errno""... $ac_c" 1>&6 -echo "configure:11437: checking for thread specific h_errno" >&5 +echo "configure:11358: checking for thread specific h_errno" >&5 if eval "test \"\${ol_cv_h_errno_thread_specific+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { h_errno = 0; ; return 0; } EOF -if { (eval echo configure:11450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_h_errno_thread_specific=yes else @@ -11505,17 +11426,17 @@ for ac_hdr in db_185.h db.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11509: checking for $ac_hdr" >&5 +echo "configure:11430: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11543,13 +11464,13 @@ done if test $ac_cv_header_db_185_h = yes -o $ac_cv_header_db_h = yes; then echo $ac_n "checking if Berkeley DB header compatibility""... $ac_c" 1>&6 -echo "configure:11547: checking if Berkeley DB header compatibility" >&5 +echo "configure:11468: checking if Berkeley DB header compatibility" >&5 if eval "test \"\${ol_cv_header_db1+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ol_cv_lib_db=no if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (default)""... $ac_c" 1>&6 -echo "configure:11590: checking for Berkeley DB link (default)" >&5 +echo "configure:11511: checking for Berkeley DB link (default)" >&5 if eval "test \"\${ol_cv_db_none+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11596,7 +11517,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_none=yes else @@ -11649,7 +11570,7 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb)""... $ac_c" 1>&6 -echo "configure:11653: checking for Berkeley DB link (-ldb)" >&5 +echo "configure:11574: checking for Berkeley DB link (-ldb)" >&5 if eval "test \"\${ol_cv_db_db+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11659,7 +11580,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db=yes else @@ -11712,7 +11633,7 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb3)""... $ac_c" 1>&6 -echo "configure:11716: checking for Berkeley DB link (-ldb3)" >&5 +echo "configure:11637: checking for Berkeley DB link (-ldb3)" >&5 if eval "test \"\${ol_cv_db_db3+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11722,7 +11643,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db3=yes else @@ -11775,7 +11696,7 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb2)""... $ac_c" 1>&6 -echo "configure:11779: checking for Berkeley DB link (-ldb2)" >&5 +echo "configure:11700: checking for Berkeley DB link (-ldb2)" >&5 if eval "test \"\${ol_cv_db_db2+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11785,7 +11706,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db2=yes else @@ -11838,7 +11759,7 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb1)""... $ac_c" 1>&6 -echo "configure:11842: checking for Berkeley DB link (-ldb1)" >&5 +echo "configure:11763: checking for Berkeley DB link (-ldb1)" >&5 if eval "test \"\${ol_cv_db_db1+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11848,7 +11769,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db1=yes else @@ -11912,17 +11833,17 @@ for ac_hdr in db.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11916: checking for $ac_hdr" >&5 +echo "configure:11837: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11952,7 +11873,7 @@ if test $ac_cv_header_db_h = yes; then ol_cv_lib_db=no if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (default)""... $ac_c" 1>&6 -echo "configure:11956: checking for Berkeley DB link (default)" >&5 +echo "configure:11877: checking for Berkeley DB link (default)" >&5 if eval "test \"\${ol_cv_db_none+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11962,7 +11883,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_none=yes else @@ -12015,7 +11936,7 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb)""... $ac_c" 1>&6 -echo "configure:12019: checking for Berkeley DB link (-ldb)" >&5 +echo "configure:11940: checking for Berkeley DB link (-ldb)" >&5 if eval "test \"\${ol_cv_db_db+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12025,7 +11946,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db=yes else @@ -12078,7 +11999,7 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb3)""... $ac_c" 1>&6 -echo "configure:12082: checking for Berkeley DB link (-ldb3)" >&5 +echo "configure:12003: checking for Berkeley DB link (-ldb3)" >&5 if eval "test \"\${ol_cv_db_db3+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12088,7 +12009,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db3=yes else @@ -12141,7 +12062,7 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb2)""... $ac_c" 1>&6 -echo "configure:12145: checking for Berkeley DB link (-ldb2)" >&5 +echo "configure:12066: checking for Berkeley DB link (-ldb2)" >&5 if eval "test \"\${ol_cv_db_db2+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12151,7 +12072,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db2=yes else @@ -12204,7 +12125,7 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb1)""... $ac_c" 1>&6 -echo "configure:12208: checking for Berkeley DB link (-ldb1)" >&5 +echo "configure:12129: checking for Berkeley DB link (-ldb1)" >&5 if eval "test \"\${ol_cv_db_db1+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12214,7 +12135,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db1=yes else @@ -12269,7 +12190,7 @@ fi if test "$ol_cv_lib_db" != no ; then ol_cv_berkeley_db=yes echo $ac_n "checking for Berkeley DB thread support""... $ac_c" 1>&6 -echo "configure:12273: checking for Berkeley DB thread support" >&5 +echo "configure:12194: checking for Berkeley DB thread support" >&5 if eval "test \"\${ol_cv_berkeley_db_thread+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12283,7 +12204,7 @@ else ol_cv_berkeley_db_thread=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_berkeley_db_thread=yes else @@ -12387,18 +12308,18 @@ fi if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = mdbm ; then echo $ac_n "checking for MDBM library""... $ac_c" 1>&6 -echo "configure:12391: checking for MDBM library" >&5 +echo "configure:12312: checking for MDBM library" >&5 if eval "test \"\${ol_cv_lib_mdbm+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ol_LIBS="$LIBS" echo $ac_n "checking for mdbm_set_chain""... $ac_c" 1>&6 -echo "configure:12397: checking for mdbm_set_chain" >&5 +echo "configure:12318: checking for mdbm_set_chain" >&5 if eval "test \"\${ac_cv_func_mdbm_set_chain+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_mdbm_set_chain=yes" else @@ -12441,7 +12362,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for mdbm_set_chain in -lmdbm""... $ac_c" 1>&6 -echo "configure:12445: checking for mdbm_set_chain in -lmdbm" >&5 +echo "configure:12366: checking for mdbm_set_chain in -lmdbm" >&5 ac_lib_var=`echo mdbm'_'mdbm_set_chain | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12449,7 +12370,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12495,17 +12416,17 @@ echo "$ac_t""$ol_cv_lib_mdbm" 1>&6 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12499: checking for $ac_hdr" >&5 +echo "configure:12420: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12532,7 +12453,7 @@ fi done echo $ac_n "checking for db""... $ac_c" 1>&6 -echo "configure:12536: checking for db" >&5 +echo "configure:12457: checking for db" >&5 if eval "test \"\${ol_cv_mdbm+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12565,18 +12486,18 @@ fi if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then echo $ac_n "checking for GDBM library""... $ac_c" 1>&6 -echo "configure:12569: checking for GDBM library" >&5 +echo "configure:12490: checking for GDBM library" >&5 if eval "test \"\${ol_cv_lib_gdbm+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ol_LIBS="$LIBS" echo $ac_n "checking for gdbm_open""... $ac_c" 1>&6 -echo "configure:12575: checking for gdbm_open" >&5 +echo "configure:12496: checking for gdbm_open" >&5 if eval "test \"\${ac_cv_func_gdbm_open+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gdbm_open=yes" else @@ -12619,7 +12540,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:12623: checking for gdbm_open in -lgdbm" >&5 +echo "configure:12544: checking for gdbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12627,7 +12548,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12673,17 +12594,17 @@ echo "$ac_t""$ol_cv_lib_gdbm" 1>&6 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12677: checking for $ac_hdr" >&5 +echo "configure:12598: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12710,7 +12631,7 @@ fi done echo $ac_n "checking for db""... $ac_c" 1>&6 -echo "configure:12714: checking for db" >&5 +echo "configure:12635: checking for db" >&5 if eval "test \"\${ol_cv_gdbm+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12744,18 +12665,18 @@ fi if test $ol_with_ldbm_api = ndbm ; then echo $ac_n "checking for NDBM library""... $ac_c" 1>&6 -echo "configure:12748: checking for NDBM library" >&5 +echo "configure:12669: checking for NDBM library" >&5 if eval "test \"\${ol_cv_lib_ndbm+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ol_LIBS="$LIBS" echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:12754: checking for dbm_open" >&5 +echo "configure:12675: checking for dbm_open" >&5 if eval "test \"\${ac_cv_func_dbm_open+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -12798,7 +12719,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6 -echo "configure:12802: checking for dbm_open in -lndbm" >&5 +echo "configure:12723: checking for dbm_open in -lndbm" >&5 ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12806,7 +12727,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lndbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12837,7 +12758,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:12841: checking for dbm_open in -ldbm" >&5 +echo "configure:12762: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12845,7 +12766,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12893,17 +12814,17 @@ echo "$ac_t""$ol_cv_lib_ndbm" 1>&6 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12897: checking for $ac_hdr" >&5 +echo "configure:12818: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12930,7 +12851,7 @@ fi done echo $ac_n "checking for db""... $ac_c" 1>&6 -echo "configure:12934: checking for db" >&5 +echo "configure:12855: checking for db" >&5 if eval "test \"\${ol_cv_ndbm+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12983,17 +12904,17 @@ if test $ol_enable_wrappers != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12987: checking for $ac_hdr" >&5 +echo "configure:12908: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13024,7 +12945,7 @@ done have_wrappers=no else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_wrappers=yes else @@ -13054,7 +12975,7 @@ EOF WRAP_LIBS="-lwrap" echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:13058: checking for main in -lnsl" >&5 +echo "configure:12979: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13062,14 +12983,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13110,12 +13031,12 @@ fi if test $ol_enable_syslog != no ; then echo $ac_n "checking for openlog""... $ac_c" 1>&6 -echo "configure:13114: checking for openlog" >&5 +echo "configure:13035: checking for openlog" >&5 if eval "test \"\${ac_cv_func_openlog+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_openlog=yes" else @@ -13169,17 +13090,17 @@ if test $ol_enable_tcl != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13173: checking for $ac_hdr" >&5 +echo "configure:13094: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13211,7 +13132,7 @@ done else for lib in tcl tcl7.6 tcl8.0 tcl8.2 ; do echo $ac_n "checking for main in -l$lib""... $ac_c" 1>&6 -echo "configure:13215: checking for main in -l$lib" >&5 +echo "configure:13136: checking for main in -l$lib" >&5 ac_lib_var=`echo $lib'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13219,14 +13140,14 @@ else ac_save_LIBS="$LIBS" LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13270,17 +13191,17 @@ for ac_hdr in termcap.h ncurses.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13274: checking for $ac_hdr" >&5 +echo "configure:13195: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13309,7 +13230,7 @@ done if test $ol_link_termcap = no ; then echo $ac_n "checking for tputs in -ltermcap""... $ac_c" 1>&6 -echo "configure:13313: checking for tputs in -ltermcap" >&5 +echo "configure:13234: checking for tputs in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tputs | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13317,7 +13238,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13361,7 +13282,7 @@ fi if test $ol_link_termcap = no ; then echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:13365: checking for initscr in -lncurses" >&5 +echo "configure:13286: checking for initscr in -lncurses" >&5 ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13369,7 +13290,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13424,17 +13345,17 @@ ol_link_spasswd=no if test $ol_with_cyrus_sasl != no ; then ac_safe=`echo "sasl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sasl.h""... $ac_c" 1>&6 -echo "configure:13428: checking for sasl.h" >&5 +echo "configure:13349: checking for sasl.h" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13458,7 +13379,7 @@ fi if test $ac_cv_header_sasl_h = yes ; then echo $ac_n "checking for sasl_client_init in -lsasl""... $ac_c" 1>&6 -echo "configure:13462: checking for sasl_client_init in -lsasl" >&5 +echo "configure:13383: checking for sasl_client_init in -lsasl" >&5 ac_lib_var=`echo sasl'_'sasl_client_init | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13466,7 +13387,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsasl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13541,13 +13462,13 @@ if test $ol_with_fetch != no ; then ol_LIBS=$LIBS LIBS="-lfetch -lcom_err $LIBS" echo $ac_n "checking fetch(3) library""... $ac_c" 1>&6 -echo "configure:13545: checking fetch(3) library" >&5 +echo "configure:13466: checking fetch(3) library" >&5 if eval "test \"\${ol_cv_lib_fetch+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -13557,7 +13478,7 @@ int main() { struct url *u = fetchParseURL("file:///"); ; return 0; } EOF -if { (eval echo configure:13561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_lib_fetch=yes else @@ -13595,17 +13516,17 @@ if test $ol_with_readline != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13599: checking for $ac_hdr" >&5 +echo "configure:13520: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13609: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13636,7 +13557,7 @@ done save_LIBS="$LIBS" LIBS="$TERMCAP_LIBS $LIBS" echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:13640: checking for readline in -lreadline" >&5 +echo "configure:13561: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13644,7 +13565,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13697,12 +13618,12 @@ fi if test $ol_enable_crypt != no ; then echo $ac_n "checking for crypt""... $ac_c" 1>&6 -echo "configure:13701: checking for crypt" >&5 +echo "configure:13622: checking for crypt" >&5 if eval "test \"\${ac_cv_func_crypt+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_crypt=yes" else @@ -13745,7 +13666,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:13749: checking for crypt in -lcrypt" >&5 +echo "configure:13670: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13753,7 +13674,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13807,12 +13728,12 @@ fi if test $ol_enable_proctitle != no ; then echo $ac_n "checking for setproctitle""... $ac_c" 1>&6 -echo "configure:13811: checking for setproctitle" >&5 +echo "configure:13732: checking for setproctitle" >&5 if eval "test \"\${ac_cv_func_setproctitle+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setproctitle=yes" else @@ -13855,7 +13776,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6 -echo "configure:13859: checking for setproctitle in -lutil" >&5 +echo "configure:13780: checking for setproctitle in -lutil" >&5 ac_lib_var=`echo util'_'setproctitle | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13863,7 +13784,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13910,12 +13831,12 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:13914: checking for ANSI C header files" >&5 +echo "configure:13835: checking for ANSI C header files" >&5 if eval "test \"\${ac_cv_header_stdc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -13923,7 +13844,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13940,7 +13861,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 @@ -13958,7 +13879,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 @@ -13979,7 +13900,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #if ((' ' & 0x0FF) == 0x020) @@ -13997,7 +13918,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:14001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -14021,12 +13942,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:14025: checking for mode_t" >&5 +echo "configure:13946: checking for mode_t" >&5 if eval "test \"\${ac_cv_type_mode_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -14057,12 +13978,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:14061: checking for off_t" >&5 +echo "configure:13982: checking for off_t" >&5 if eval "test \"\${ac_cv_type_off_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -14093,12 +14014,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:14097: checking for pid_t" >&5 +echo "configure:14018: checking for pid_t" >&5 if eval "test \"\${ac_cv_type_pid_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -14129,19 +14050,19 @@ EOF fi echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6 -echo "configure:14133: checking for ptrdiff_t" >&5 +echo "configure:14054: checking for ptrdiff_t" >&5 if eval "test \"\${am_cv_type_ptrdiff_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ptrdiff_t p ; return 0; } EOF -if { (eval echo configure:14145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_type_ptrdiff_t=yes else @@ -14162,12 +14083,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:14166: checking return type of signal handlers" >&5 +echo "configure:14087: checking return type of signal handlers" >&5 if eval "test \"\${ac_cv_type_signal+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -14184,7 +14105,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:14188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -14203,12 +14124,12 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:14207: checking for size_t" >&5 +echo "configure:14128: checking for size_t" >&5 if eval "test \"\${ac_cv_type_size_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -14240,12 +14161,12 @@ fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:14244: checking for ssize_t" >&5 +echo "configure:14165: checking for ssize_t" >&5 if eval "test \"\${ac_cv_type_ssize_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -14276,12 +14197,12 @@ EOF fi echo $ac_n "checking for caddr_t""... $ac_c" 1>&6 -echo "configure:14280: checking for caddr_t" >&5 +echo "configure:14201: checking for caddr_t" >&5 if eval "test \"\${ac_cv_type_caddr_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -14313,12 +14234,12 @@ fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:14317: checking for socklen_t" >&5 +echo "configure:14238: checking for socklen_t" >&5 if eval "test \"\${ol_cv_type_socklen_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_type_socklen_t=yes else @@ -14353,12 +14274,12 @@ EOF fi echo $ac_n "checking for member st_blksize in aggregate type struct stat""... $ac_c" 1>&6 -echo "configure:14357: checking for member st_blksize in aggregate type struct stat" >&5 +echo "configure:14278: checking for member st_blksize in aggregate type struct stat" >&5 if eval "test \"\${ac_cv_c_struct_member_st_blksize+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -14366,7 +14287,7 @@ int main() { struct stat foo; foo.st_blksize; ; return 0; } EOF -if { (eval echo configure:14370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_struct_member_st_blksize=yes else @@ -14388,12 +14309,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:14392: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:14313: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"\${ac_cv_header_time+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -14402,7 +14323,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:14406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -14423,12 +14344,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:14427: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:14348: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"\${ac_cv_struct_tm+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -14436,7 +14357,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:14440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -14457,12 +14378,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:14461: checking for uid_t in sys/types.h" >&5 +echo "configure:14382: checking for uid_t in sys/types.h" >&5 if eval "test \"\${ac_cv_type_uid_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -14491,19 +14412,19 @@ EOF fi echo $ac_n "checking for sig_atomic_t""... $ac_c" 1>&6 -echo "configure:14495: checking for sig_atomic_t" >&5 +echo "configure:14416: checking for sig_atomic_t" >&5 if eval "test \"\${ol_cv_type_sig_atomic_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { sig_atomic_t atomic; ; return 0; } EOF -if { (eval echo configure:14507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_type_sig_atomic_t=yes else @@ -14527,13 +14448,13 @@ EOF # test for pw_gecos in struct passwd echo $ac_n "checking struct passwd for pw_gecos""... $ac_c" 1>&6 -echo "configure:14531: checking struct passwd for pw_gecos" >&5 +echo "configure:14452: checking struct passwd for pw_gecos" >&5 if eval "test \"\${ol_cv_struct_passwd_pw_gecos+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -14543,7 +14464,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_struct_passwd_pw_gecos=yes else @@ -14565,13 +14486,13 @@ fi # test for pw_passwd in struct passwd echo $ac_n "checking struct passwd for pw_passwd""... $ac_c" 1>&6 -echo "configure:14569: checking struct passwd for pw_passwd" >&5 +echo "configure:14490: checking struct passwd for pw_passwd" >&5 if eval "test \"\${ol_cv_struct_passwd_pw_passwd+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -14581,7 +14502,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_struct_passwd_pw_passwd=yes else @@ -14603,7 +14524,7 @@ fi echo $ac_n "checking if toupper() requires islower()""... $ac_c" 1>&6 -echo "configure:14607: checking if toupper() requires islower()" >&5 +echo "configure:14528: checking if toupper() requires islower()" >&5 if eval "test \"\${ol_cv_c_upper_lower+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14612,7 +14533,7 @@ else ol_cv_c_upper_lower=safe else cat > conftest.$ac_ext < @@ -14624,7 +14545,7 @@ main() exit(1); } EOF -if { (eval echo configure:14628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_c_upper_lower=no else @@ -14647,12 +14568,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:14651: checking for working const" >&5 +echo "configure:14572: checking for working const" >&5 if eval "test \"\${ac_cv_c_const+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -14722,12 +14643,12 @@ EOF fi echo $ac_n "checking if compiler understands volatile""... $ac_c" 1>&6 -echo "configure:14726: checking if compiler understands volatile" >&5 +echo "configure:14647: checking if compiler understands volatile" >&5 if eval "test \"\${ol_cv_c_volatile+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_c_volatile=yes else @@ -14766,14 +14687,14 @@ EOF else echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:14770: checking whether byte ordering is bigendian" >&5 +echo "configure:14691: checking whether byte ordering is bigendian" >&5 if eval "test \"\${ac_cv_c_bigendian+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -14784,11 +14705,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:14788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -14799,7 +14720,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:14803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -14819,7 +14740,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -14858,13 +14779,13 @@ fi fi echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:14862: checking size of short" >&5 +echo "configure:14783: checking size of short" >&5 if eval "test \"\${ac_cv_sizeof_short+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -14874,7 +14795,7 @@ int main() { switch (0) case 0: case (sizeof (short) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:14878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_short=$ac_size else @@ -14897,13 +14818,13 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:14901: checking size of int" >&5 +echo "configure:14822: checking size of int" >&5 if eval "test \"\${ac_cv_sizeof_int+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -14913,7 +14834,7 @@ int main() { switch (0) case 0: case (sizeof (int) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:14917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_int=$ac_size else @@ -14936,13 +14857,13 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:14940: checking size of long" >&5 +echo "configure:14861: checking size of long" >&5 if eval "test \"\${ac_cv_sizeof_long+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -14952,7 +14873,7 @@ int main() { switch (0) case 0: case (sizeof (long) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:14956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_long=$ac_size else @@ -15003,7 +14924,7 @@ EOF echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:15007: checking for 8-bit clean memcmp" >&5 +echo "configure:14928: checking for 8-bit clean memcmp" >&5 if eval "test \"\${ac_cv_func_memcmp_clean+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15011,7 +14932,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -15039,12 +14960,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:15043: checking for strftime" >&5 +echo "configure:14964: checking for strftime" >&5 if eval "test \"\${ac_cv_func_strftime+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -15090,7 +15011,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:15094: checking for strftime in -lintl" >&5 +echo "configure:15015: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15098,7 +15019,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15137,12 +15058,12 @@ fi echo $ac_n "checking for inet_aton()""... $ac_c" 1>&6 -echo "configure:15141: checking for inet_aton()" >&5 +echo "configure:15062: checking for inet_aton()" >&5 if eval "test \"\${ol_cv_func_inet_aton+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_func_inet_aton=yes else @@ -15186,12 +15107,12 @@ EOF echo $ac_n "checking for _spawnlp""... $ac_c" 1>&6 -echo "configure:15190: checking for _spawnlp" >&5 +echo "configure:15111: checking for _spawnlp" >&5 if eval "test \"\${ac_cv_func__spawnlp+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__spawnlp=yes" else @@ -15239,12 +15160,12 @@ fi echo $ac_n "checking for _snprintf""... $ac_c" 1>&6 -echo "configure:15243: checking for _snprintf" >&5 +echo "configure:15164: checking for _snprintf" >&5 if eval "test \"\${ac_cv_func__snprintf+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__snprintf=yes" else @@ -15294,12 +15215,12 @@ fi echo $ac_n "checking for _vsnprintf""... $ac_c" 1>&6 -echo "configure:15298: checking for _vsnprintf" >&5 +echo "configure:15219: checking for _vsnprintf" >&5 if eval "test \"\${ac_cv_func__vsnprintf+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__vsnprintf=yes" else @@ -15349,12 +15270,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:15353: checking for vprintf" >&5 +echo "configure:15274: checking for vprintf" >&5 if eval "test \"\${ac_cv_func_vprintf+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -15402,12 +15323,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:15406: checking for _doprnt" >&5 +echo "configure:15327: checking for _doprnt" >&5 if eval "test \"\${ac_cv_func__doprnt+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -15460,12 +15381,12 @@ if test $ac_cv_func_vprintf = yes ; then for ac_func in vsnprintf vsprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15464: checking for $ac_func" >&5 +echo "configure:15385: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15568,12 +15489,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15572: checking for $ac_func" >&5 +echo "configure:15493: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15625,12 +15546,12 @@ done for ac_func in getopt tempnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15629: checking for $ac_func" >&5 +echo "configure:15550: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15691,13 +15612,13 @@ fi # Check Configuration echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6 -echo "configure:15695: checking declaration of sys_errlist" >&5 +echo "configure:15616: checking declaration of sys_errlist" >&5 if eval "test \"\${ol_cv_dcl_sys_errlist+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -15710,7 +15631,7 @@ int main() { char *c = (char *) *sys_errlist ; return 0; } EOF -if { (eval echo configure:15714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_dcl_sys_errlist=yes ol_cv_have_sys_errlist=yes @@ -15733,20 +15654,20 @@ EOF echo $ac_n "checking existence of sys_errlist""... $ac_c" 1>&6 -echo "configure:15737: checking existence of sys_errlist" >&5 +echo "configure:15658: checking existence of sys_errlist" >&5 if eval "test \"\${ol_cv_have_sys_errlist+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *c = (char *) *sys_errlist ; return 0; } EOF -if { (eval echo configure:15750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_have_sys_errlist=yes else @@ -16078,8 +15999,6 @@ fi - - @@ -16308,7 +16227,6 @@ s%@BUILD_LDAP@%$BUILD_LDAP%g s%@BUILD_LDBM@%$BUILD_LDBM%g s%@BUILD_PASSWD@%$BUILD_PASSWD%g s%@BUILD_PERL@%$BUILD_PERL%g -s%@BUILD_QUIPU@%$BUILD_QUIPU%g s%@BUILD_SHELL@%$BUILD_SHELL%g s%@BUILD_SQL@%$BUILD_SQL%g s%@BUILD_TCL@%$BUILD_TCL%g @@ -16324,7 +16242,6 @@ s%@BUILD_SLURPD@%$BUILD_SLURPD%g s%@LDAP_LIBS@%$LDAP_LIBS%g s%@LDIF_LIBS@%$LDIF_LIBS%g s%@SLAPD_LIBS@%$SLAPD_LIBS%g -s%@QUIPU_LIBS@%$QUIPU_LIBS%g s%@SLURPD_LIBS@%$SLURPD_LIBS%g s%@LDBM_LIBS@%$LDBM_LIBS%g s%@LTHREAD_LIBS@%$LTHREAD_LIBS%g diff --git a/doc/man/man8/centipede.8 b/doc/man/man8/centipede.8 deleted file mode 100644 index 361f1aa6b4..0000000000 --- a/doc/man/man8/centipede.8 +++ /dev/null @@ -1,162 +0,0 @@ -.TH CENTIPEDE 8C "22 September 1998" "OpenLDAP LDVERSION" -.\" $OpenLDAP$ -.\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved. -.\" Copying restrictions apply. See COPYRIGHT/LICENSE. -.SH NAME -centipede \- LDAP centroid index generation and maintenance program -.SH SYNOPSIS -.B SBINDIR/centipede -.B [\-f filter] -.B [\-F] [\-R] -.B [\-f filter] [\-t directory] -.B [\-m authmethod] [\-b binddn] -.B [\-p passwd] [\-c cachesize] -.B \-s sourceurl \-d desturl attributes -.SH DESCRIPTION -.LP -The centipede program is used to extract centroid or other index -information from one LDAP server and install it in another. Although -index information can be extracted from any LDAP server, only a -.BR slapd (8) -LDAP server will understand the information and thus be capable of -making use of it as indexing information (i.e., you should only -install index information in a -.BR slapd (8) -LDAP server). -.LP -The basic form of the command is as follows -.LP -.nf -.ft tt - SBINDIR/centipede [options] - -s "ldap://[host/]subtree-to-index-dn" - -d "ldap://[host/]parent-of-index-entry-dn" - attributes -.ft -.fi -.LP -where the -.B \-s -option specifies the subtree for which index information is to -be generated, and the -.B \-d -option specifies the parent under which the index information is to -be installed. -.LP -For example, suppose you are running an -LDAP server on the host -.I babs.com -for an organization called "BabsCo" based in the US, and you want to -generate index information for the cn, sn and objectclass attributes of -all the people entries in your subtree. You want to install the index -informatioin in the indexing -.BR slapd (8) -running on the host -.I vertigo.rs.itd.umich.edu -under the c=US entry. -This way, when an LDAP client connects to the -.BR slapd (8) -on vertigo and does a subtree search of c=US, -.BR slapd (8) -can consult the index information to tell whether it should refer the -client to your server or not. You could accomplish this with a command -like this: -.LP -.nf -.ft tt - SBINDIR/centipede -f '(objectclass=person)' - -m simple -b your-rootdn -p your-rootdnpw - -s "ldap://babs.com/o=BabsCo, c=US" - -d "ldap://vertigo.rs.itd.umich.edu/c=US" - cn sn objectclass -.ft -.fi -.LP -Note the -.B \-b -and -.B \-p -options can be used to authenticate as an entity able to read all -the information you want. -.LP -See "The SLAPD and SLURPD Administrator's Guide" for more details on -using this program. -.SH OPTIONS -.TP -.B \-v -Turn on verbose mode. This option can be given multiple times to increase -the level of verbosity. -.TP -.B \-n -Do not actually install index information. Useful in conjunction with -.B -v -for seeing what -.B centipede -is up to. -.TP -.BI \-f " ldapfilter" -Specify a filter used to select the entries for which to generate indexing -information. -.I ldapfilter -should be a string LDAP filter as described by RFC 1588. -.TP -.BI \-F -Generate full, as opposed to relative, index information. -.TP -.BI \-R -Generate relative, as opposed to full, index information. Full information -is still generated if there is no previous information available from -which to generate the relative information. This is the default. -.TP -.BI \-t " directory" -Specify the directory in which to create temporary files, find existing -index information, and put new index information. The default is -whatever is used by tempnam. -.TP -.BI \-b " binddn" -Specify the DN to authenticate with when extracting index information. -.TP -.BI \-p " passwd" -Specify the password to use for simple authentication when extracting -index information. -.TP -.BI \-m " authmethod" -Specify the authentication method to use when extracting index information. -.I authmethod -should be either "simple" or "kerberos". -.TP -.BI \-B " binddn" -Specify the DN to authenticate with when installing index information. -.TP -.BI \-P " passwd" -Specify the password to use for simple authentication when installing -index information. -.TP -.BI \-M " authmethod" -Specify the authentication method to use when installing index information. -.I authmethod -should be either "simple" or "kerberos". -.TP -.BI \-c " cachesize" -Specify the size in bytes of the cache used when building the new -index information. Upping this number can cause a big performance boost, -if you've got the memory for it. -.SH NOTES -This is all very experimental at the moment, and is subject to change. -.LP -Currently, -.B centipede -only handles value-based index information. A future version of centipede -will allow other types of index information to be manipulated (e.g., -word-based indexes, substring indexes, phonetic indexes, hash indexes, -etc.). A future version may also allow weights to be generated. -.SH "SEE ALSO" -.BR ldap (3), -.BR slapd (8) -.LP -"The SLAPD and SLURPD Administrator's Guide" -.SH ACKNOWLEDGEMENTS -.B OpenLDAP -is developed and maintained by The OpenLDAP Project (http://www.openldap.org/). -.B OpenLDAP -is derived from University of Michigan LDAP 3.3 Release. diff --git a/doc/man/man8/chlog2replog.8 b/doc/man/man8/chlog2replog.8 deleted file mode 100644 index d17c83cc5c..0000000000 --- a/doc/man/man8/chlog2replog.8 +++ /dev/null @@ -1,110 +0,0 @@ -.TH CHLOG2REPLOG 8C "22 September 1998" "OpenLDAP LDVERSION" -.\" $OpenLDAP$ -.\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved. -.\" Copying restrictions apply. See COPYRIGHT/LICENSE. -.SH NAME -chlog2replog \- convert an X.500 DSA-style changelog to an LDAP-style -replication log -.SH SYNOPSIS -.B SBINDIR/chlog2replog -.B \-r hostname:port [\-r hostname:port ...] -.B \-d dn\-suffix [\-o output\-file] < input\-file -.LP -.SH DESCRIPTION -.LP -chlog2replog is used to convert an X.500\-style changelog to an -LDAP\-style replication log. It reads its standard input and -writes standard output if no \-o flag is given. If the \-o flag -is given, -.B chlog2replog -writes its output to the given file, following -the same advisory locking mechanisms respected by the -.B slurpd -program. This makes it possible to use chlog2replog in a pipeline -to produce input for -.B slurpd. - -.SH OPTIONS -.TP -.BI \-r " hostname:port" -This option specifies the hostname and port number to which updates -should be propagated. -.B chlog2replog -will include one "replica: hostname:port" directive in each replication -log entry it writes out for each -.B \-r -option given. You may supply as many replica hostname:port options as -you wish. -.TP -.BI \-d " dn\-suffix" -This option specifies an additional string to append to converted -DNs (Distinguished Names) converted from the changelog file. The -DNs in the changelog file will typically be partial DNs which omit -the portion of the directory tree "above" the organizational root. -For example, if your directory tree is rooted at o=University of -Michigan, c=US, you will need to include the argument -"\-d ", o=University of Michigan, c=US". -.TP -.BI \-o " output\-file" -If given, this option specifies an output file to which converted -replication log entries will be written. -.B chlog2replog -obeys the same file locking conventions used by -.B slurpd, -so that it is possible to use -.B chlog2replog -to "feed" changes from an X.500 DSA to -.B slurpd. See the -.B examples -section, below, for more information. -.SH EXAMPLES -To read the DSA-style changelog file -.BR changlelog -and write on the standard output an LDAP-style replication log, -appending ", o=University of Michigan, c=US" to all entry -DNs, and including a replica: entry for host "ldapserver," port -389, give the command: -.LP -.nf -.ft tt - SBINDIR/chlog2replog -d ", o=University of Michigan, c=US" - -r ldapserver:389 < changelog -.ft -.fi -.LP -To do the same, but routing the output to the file "replog," using -slurpd\-compatible file\-locking, -give this command: -.LP -.nf -.ft tt - SBINDIR/chlog2replog -d ", o=University of Michigan, c=US" - -r ldapserver:389 -o replog < changelog -.ft -.fi -.LP -To continually read new changes from the file "changelog" and write -them to the file "replog", -give this command: -.LP -.nf -.ft tt - tail +0f changelog | SBINDIR/chlog2replog - -d ", o=University of Michigan, c=US" - -r ldapserver:389 -o replog < changelog -.ft -.fi - -.LP -.SH "SEE ALSO" -.BR ldap (3), -.BR ldif (5), -.BR slurpd (8), -.BR slapd (8), -.LP -"The SLAPD and SLURPD Administrator's Guide" -.SH ACKNOWLEDGEMENTS -.B OpenLDAP -is developed and maintained by The OpenLDAP Project (http://www.openldap.org/). -.B OpenLDAP -is derived from University of Michigan LDAP 3.3 Release. diff --git a/doc/man/man8/edb2ldif.8 b/doc/man/man8/edb2ldif.8 deleted file mode 100644 index bcfcadbe4f..0000000000 --- a/doc/man/man8/edb2ldif.8 +++ /dev/null @@ -1,107 +0,0 @@ -.TH EDB2LDIF 8C "22 September 1998" "OpenLDAP LDVERSION" -.\" $OpenLDAP$ -.\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved. -.\" Copying restrictions apply. See COPYRIGHT/LICENSE. -.SH NAME -edb2ldif \- QUIPU EDB file to LDIF conversion tool -.SH SYNOPSIS -.B SBINDIR/edb2ldif -.B [\-d] [\-v] [\-r] [\-o] [\-b basedn] -.B [\-a addvalsfile] [\-f fileattrdir] -.B [\-i ignoreattr...] [edbfile...] -.B -.SH DESCRIPTION -.LP -Data that is held in a QUIPU DSA (available as part of the ISODE package) -is stored in or can be easily converted to the EDB file format. The -.I edb2ldif -tool is used to convert directory data from EDB file format to the -LDAP Directory Interchange Format (LDIF) used by -.BR slapd (8) -and associated utilities. The -.BR slapadd (8) -program can be used to convert the resulting LDIF data into a database -that is compatible with -.BR slapd (8). -.LP -.I edb2ldif -writes LDIF formatted data to standard output. If you specify a particular -.I edbfile -(or files) to read data from, they are converted. If no -.I edbfile -is specified, the files named -.BR EDB.root -(if it exists) and -.BR EDB -in the current directory are converted. An entire EDB hierarchy -can be converted using the -.B \-r -option. -.LP -When -.I edb2ldif -is invoked, it will also look for files named -.BR .add -in the directories -where EDB files are found and append the contents of the -.BR .add -file to each entry in the corresponding EDB file. -Typically, this feature is used to include inherited -attribute values (e.g., objectClass) that do not appear in the EDB files. -.LP -See "The SLAPD and SLURPD Administrator's Guide" for more details on -using -.I edb2ldif, -including step-by-step conversion instructions. -.SH OPTIONS -.TP -.B \-d -Turn on some extra debugging which is written to standard error. -.TP -.B \-v -Enable verbose mode that writes status information to standard error, such -as which EDB file is being processed, how many entries have been -converted so far, etc. -.TP -.B \-r -Recurse through child directories, processing all EDB files found. -.TP -.B \-o -Cause local -.B .add -file definitions to override the global addfile (see the -.B \-a -option below) -.TP -.BI \-b " basedn" -Specify the Distinguished Name that all EDB file entries appear below. -.TP -.B \-a " addvalsfile" -The LDIF information contained in this file will be appended to each entry. -(See the -.B \-o -option above.) -.TP -.BI \-f " fileattrdir" -Specify a single directory where all file-based attributes (typically sounds -and images) can be found. If this option is not given, file attributes are -assumed to be located in the same directory as the EDB file that refers to -them. -.TP -.BI \-i " ignoreattr" -Specify an attribute that should not be converted. You can include as many -\- i flags as necessary. -.SH "SEE ALSO" -.BR ldap (3), -.BR ldif (5), -.BR slapd (8), -.BR slapadd (8) -.LP -"The SLAPD and SLURPD Administrator's Guide" -.LP -Volume 5 of The ISODE Manual -.SH ACKNOWLEDGEMENTS -.B OpenLDAP -is developed and maintained by The OpenLDAP Project (http://www.openldap.org/). -.B OpenLDAP -is derived from University of Michigan LDAP 3.3 Release. diff --git a/doc/man/man8/ldif.8 b/doc/man/man8/ldif.8 deleted file mode 100644 index be3bc42847..0000000000 --- a/doc/man/man8/ldif.8 +++ /dev/null @@ -1,56 +0,0 @@ -.TH LDIF 8C "22 September 1998" "OpenLDAP LDVERSION" -.\" $OpenLDAP$ -.\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved. -.\" Copying restrictions apply. See COPYRIGHT/LICENSE. -.SH NAME -ldif \- convert arbitrary data to LDIF format -.SH SYNOPSIS -.B SBINDIR/ldif [\-b] attr\-name -.LP -.SH DESCRIPTION -.LP -This program is used to convert arbitrary data to the -LDAP Directory Interchange Format (LDIF) described in -.BR ldif (5). -.B ldif -reads data from standard input, converts it, -and writes the corresponding LDIF output to standard output. -The output is suitable for use as a line in an -.BR ldif (5) -file. -.LP -Without the -.B \-b -flag, -.B ldif -considers its input a sequence of values to be -converted, one per line. With the -.B \-b -flag, -.B ldif -considers its input as a single raw binary value to be -converted. This can be useful when converting binary data -such as a photo or audio attribute. -.LP -See "The SLAPD and SLURPD Administrator's Guide" for more details on -using this program. -.SH OPTIONS -.TP -.B \-b -This option specifies that -.B ldif -should interpret its input as a single binary value for conversion. -Otherwise, it interprets it as a sequence of lines, with each line -containing a single value. -.SH "SEE ALSO" -.BR ldap (3), -.BR ldif (5), -.BR slapadd (8), -.BR slapd (8) -.LP -"The SLAPD and SLURPD Administrator's Guide" -.SH ACKNOWLEDGEMENTS -.B OpenLDAP -is developed and maintained by The OpenLDAP Project (http://www.openldap.org/). -.B OpenLDAP -is derived from University of Michigan LDAP 3.3 Release. diff --git a/include/portable.h.in b/include/portable.h.in index 7cfb384983..b93bfe4b12 100644 --- a/include/portable.h.in +++ b/include/portable.h.in @@ -453,9 +453,6 @@ /* Define if you have the header file. */ #undef HAVE_PWD_H -/* Define if you have the header file. */ -#undef HAVE_QUIPU_COMMONARG_H - /* Define if you have the header file. */ #undef HAVE_READLINE_HISTORY_H diff --git a/libraries/libavl/libavl.dsw b/libraries/libavl/libavl.dsw deleted file mode 100644 index a3ea4fd280..0000000000 --- a/libraries/libavl/libavl.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "libavl"=.\libavl.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libraries/libavl/testavl.dsw b/libraries/libavl/testavl.dsw deleted file mode 100644 index 8829d3b5b6..0000000000 --- a/libraries/libavl/testavl.dsw +++ /dev/null @@ -1,44 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "libavl"=.\libavl.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "testavl"=.\testavl.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libavl - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libraries/liblber/dtest.dsw b/libraries/liblber/dtest.dsw deleted file mode 100644 index ba86f70635..0000000000 --- a/libraries/liblber/dtest.dsw +++ /dev/null @@ -1,44 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "dtest"=.\dtest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency -}}} - -############################################################################### - -Project: "liblber"=.\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libraries/liblber/etest.dsw b/libraries/liblber/etest.dsw deleted file mode 100644 index 2cf4d7231b..0000000000 --- a/libraries/liblber/etest.dsw +++ /dev/null @@ -1,44 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "etest"=.\etest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency -}}} - -############################################################################### - -Project: "liblber"=.\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libraries/liblber/idtest.dsw b/libraries/liblber/idtest.dsw deleted file mode 100644 index c0323785ed..0000000000 --- a/libraries/liblber/idtest.dsw +++ /dev/null @@ -1,44 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "idtest"=.\idtest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency -}}} - -############################################################################### - -Project: "liblber"=.\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libraries/liblber/liblber.dsw b/libraries/liblber/liblber.dsw deleted file mode 100644 index a3ac447307..0000000000 --- a/libraries/liblber/liblber.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "liblber"=.\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libraries/libldap/apitest.dsw b/libraries/libldap/apitest.dsw deleted file mode 100644 index bb514f16e2..0000000000 --- a/libraries/libldap/apitest.dsw +++ /dev/null @@ -1,59 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "apitest"=.\apitest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libldap - End Project Dependency -}}} - -############################################################################### - -Project: "liblber"=..\liblber\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldap"=.\libldap.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libraries/libldap/libldap.dsw b/libraries/libldap/libldap.dsw deleted file mode 100644 index 067d25e554..0000000000 --- a/libraries/libldap/libldap.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "libldap"=.\libldap.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libraries/libldap/ltest.dsw b/libraries/libldap/ltest.dsw deleted file mode 100644 index 6cc5a01052..0000000000 --- a/libraries/libldap/ltest.dsw +++ /dev/null @@ -1,74 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "liblber"=..\liblber\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldap"=.\libldap.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "liblutil"=..\liblutil\liblutil.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ltest"=.\ltest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libldap - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblutil - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libraries/libldap_r/apitest_r.dsw b/libraries/libldap_r/apitest_r.dsw deleted file mode 100644 index 60451a724a..0000000000 --- a/libraries/libldap_r/apitest_r.dsw +++ /dev/null @@ -1,59 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "apitest_r"=.\apitest_r.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libldap_r - End Project Dependency -}}} - -############################################################################### - -Project: "liblber"=..\liblber\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldap_r"=.\libldap_r.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libraries/libldap_r/libldap_r.dsw b/libraries/libldap_r/libldap_r.dsw deleted file mode 100644 index e80ddacc30..0000000000 --- a/libraries/libldap_r/libldap_r.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "libldap_r"=.\libldap_r.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libraries/libldap_r/ltest.dsw b/libraries/libldap_r/ltest.dsw deleted file mode 100644 index 6cc5a01052..0000000000 --- a/libraries/libldap_r/ltest.dsw +++ /dev/null @@ -1,74 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "liblber"=..\liblber\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldap"=.\libldap.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "liblutil"=..\liblutil\liblutil.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ltest"=.\ltest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libldap - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblutil - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libraries/libldap_r/ltest_r.dsw b/libraries/libldap_r/ltest_r.dsw deleted file mode 100644 index 6cc5a01052..0000000000 --- a/libraries/libldap_r/ltest_r.dsw +++ /dev/null @@ -1,74 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "liblber"=..\liblber\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldap"=.\libldap.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "liblutil"=..\liblutil\liblutil.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ltest"=.\ltest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libldap - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblutil - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libraries/libldif/libldif.dsw b/libraries/libldif/libldif.dsw deleted file mode 100644 index d692d5b4fd..0000000000 --- a/libraries/libldif/libldif.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "libldif"=.\libldif.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libraries/liblutil/liblutil.dsw b/libraries/liblutil/liblutil.dsw deleted file mode 100644 index 2aaef3b026..0000000000 --- a/libraries/liblutil/liblutil.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "liblutil"=.\liblutil.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libraries/liblutil/passwd.dsw b/libraries/liblutil/passwd.dsw deleted file mode 100644 index 4746b7401d..0000000000 --- a/libraries/liblutil/passwd.dsw +++ /dev/null @@ -1,44 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "passwd"=.\passwd.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency -}}} - -############################################################################### - -Project: "liblber"=.\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/servers/slapd/slapd.dsw b/servers/slapd/slapd.dsw deleted file mode 100644 index b3c3ca4ded..0000000000 --- a/servers/slapd/slapd.dsw +++ /dev/null @@ -1,167 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "backldbm"=".\back-ldbm\backldbm.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libavl"=..\..\libraries\libavl\libavl.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "liblber"=..\..\libraries\liblber\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldap_r"=..\..\libraries\libldap_r\libldap_r.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency -}}} - -############################################################################### - -Project: "libldbm"=..\..\libraries\libldbm\libldbm.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldif"=..\..\libraries\libldif\libldif.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "liblutil"=..\..\libraries\liblutil\liblutil.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libslapd"=.\libslapd.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "setup"=..\..\include\setup.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "slapd"=.\slapd.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libavl - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency - Begin Project Dependency - Project_Dep_Name libldbm - End Project Dependency - Begin Project Dependency - Project_Dep_Name libldif - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblutil - End Project Dependency - Begin Project Dependency - Project_Dep_Name libldap_r - End Project Dependency - Begin Project Dependency - Project_Dep_Name backldbm - End Project Dependency - Begin Project Dependency - Project_Dep_Name libslapd - End Project Dependency - Begin Project Dependency - Project_Dep_Name setup - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in index 8ce6b4eb86..308bf9ed76 100644 --- a/servers/slapd/tools/Makefile.in +++ b/servers/slapd/tools/Makefile.in @@ -29,21 +29,16 @@ XLIBS = -lavl -lldif -lldbm -llutil -lldap_r -llber XXLIBS = $(SLAPD_LIBS) \ $(LDBM_LIBS) $(SECURITY_LIBS) \ $(LDIF_LIBS) $(LUTIL_LIBS) -XXXLIBS = $(LTHREAD_LIBS) $(MODULES_LIBS) +XXXLIBS = $(MODULES_LIBS) $(LTHREAD_LIBS) -PROGRAMS=ldif slappasswd slapadd slapcat slapindex -LDBMPROGRAMS=centipede sizecount +PROGRAMS=slapadd slapcat slapindex slappasswd # CPPFLAGS will include the defines for dynamic libs in Mingw32. NT_DYN_DEFS = -DLBER_DECL=dllimport -DLDAP_DECL=dllimport CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_DEFS) -SRCS = ldif.c mimic.c slapcommon.c slapadd.c slapcat.c slapindex.c - -XSRCS = edb2-vers.c - -# LDBMSRCS = centipede.c sizecount.c -LDBMSRCS = +SRCS = mimic.c slapcommon.c \ + slapadd.c slapcat.c slapindex.c slappasswd.c SLAPD_OBJS = ../config.o ../ch_malloc.o ../backend.o ../charray.o \ ../module.o ../aclparse.o ../filterentry.o \ @@ -56,21 +51,10 @@ SLAPD_OBJS = ../config.o ../ch_malloc.o ../backend.o ../charray.o \ SLAPOBJS = $(SLAPD_OBJS) slapcommon.o mimic.o -EDB2LDIFSRCS = edb2ldif.c ldapsyntax.c -EDB2LDIFOBJS = edb2ldif.o ldapsyntax.o - -UNIX_PRGS = build-ldbm - -all-local: build-progs $(@PLAT@_PRGS) +all-local: build-progs build-progs: $(PROGRAMS) -build-ldbm: ldbm-tools-$(BUILD_LDBM) -ldbm-tools-no: - @echo "run configure with --enable-ldbm to build LDBM tools" - -ldbm-tools-yes ldbm-tools-mod: $(LDBMPROGRAMS) - # # SLAP Tools # @@ -83,39 +67,11 @@ slapcat: slapcat.o ../libbackends.a $(SLAPOBJS) $(SLAPD_LIBDEPEND) slapindex: slapindex.o ../libbackends.a $(SLAPOBJS) $(SLAPD_LIBDEPEND) $(LTLINK) -o $@ slapindex.o $(SLAPOBJS) ../libbackends.a $(LIBS) -ldif: ldif.o $(SLAPD_LIBDEPEND) - $(LTLINK) -o $@ ldif.o $(LIBS) - slappasswd: slappasswd.o $(SLAPD_LIBDEPEND) $(LTLINK) -o $@ slappasswd.o $(LIBS) -# -# LDBM Specific Tools -# (deprecated) -centipede: centipede.o $(SLAPD_LIBDEPEND) - $(LTLINK) -o $@ centipede.o $(LIBS) - -sizecount: sizecount.o ../phonetic.o ../ch_malloc.o $(SLAPD_LIBDEPEND) - $(LTLINK) -o $@ sizecount.o ../phonetic.o ../ch_malloc.o $(LIBS) - clean-local: FORCE - $(RM) $(PROGRAMS) $(LDBMPROGRAMS) \ - $(XPROGRAMS) $(XSRCS) *.o core .libs/* *.exe + $(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) *.o core .libs/* *.exe depend-local: FORCE - DEPEND_LDBM= ; \ - if [ "$(BUILD_LDBM)" != "no" ]; then \ - DEPEND_LDBM="$(LDBMSRCS)"; \ - fi; \ - $(MKDEP) $(DEFS) $(DEFINES) $(SRCS) $$DEPEND_LDBM - -install-local: install-ldbm-$(BUILD_LDBM) - -install-ldbm-no: - -install-ldbm-yes install-ldbm-mod: FORCE - -$(MKDIR) $(DESTDIR)$(sbindir) - @for bin in $(PROGRAMS); do \ - $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \ - $$bin$(EXEEXT) $(DESTDIR)$(sbindir); \ - done + $(MKDEP) $(DEFS) $(DEFINES) $(SRCS) diff --git a/servers/slapd/tools/centipede.c b/servers/slapd/tools/centipede.c deleted file mode 100644 index 732c8405dc..0000000000 --- a/servers/slapd/tools/centipede.c +++ /dev/null @@ -1,1026 +0,0 @@ -/* centipede.c - generate and install indexing information (view w/tabstop=4) */ -/* $OpenLDAP$ */ - -#include "portable.h" - -#include -#include - -#include -#include -#include -#include /* get link(), unlink() */ - -#include -#include - -int slap_debug; - -#define DEFAULT_LDAPFILTER "(objectclass=*)" - -#define CENTROID_VALUE 1 -#define CENTROID_WORD 2 - -#define CENTROID_RELATIVE 1 -#define CENTROID_FULL 2 - -#define WORD_BREAKS " -',.()!;:&$%*\"/\\+_<>=?[]|^~" - -char *centdir; -int ldbmcachesize; -int centroidvalues; -int centroidtype; -int doweights; -char *ldaphost; -char *srcldapbinddn; -char *srcldappasswd; -char *destldapbinddn; -char *destldappasswd; -char *ldapbase; -int srcldapauthmethod; -int destldapauthmethod; -int verbose; -int not; - -static LDAP *start_ldap_search(char *ldapsrcurl, char *ldapfilter, char **attrs); -static LDAP *bind_to_destination_ldap(char *ldapsrcurl, char *ldapdesturl); -static int create_tmp_files(char **attrs, char ***tmpfile, LDBM **ldbm); -static int generate_new_centroids(LDAP *ld, char **attrs, LDBM *ldbm); -static LDAPMod **diff_centroids(char *attr, LDBM oldbm, LDBM nldbm, int nentries); -static LDAPMod **full_centroid(char *attr, LDBM ldbm, int nentries); -static char **charray_add_dup(char ***a, int *cur, int *max, char *s); - -static void usage( char *name ) -{ - fprintf( stderr, "usage: %s [options] -s url -d url attributes\n", name ); - fprintf( stderr, "where:\n" ); - fprintf( stderr, "\t-s url\t\t[[ldap://][host[:port]]/]searchbasedn\n"); - fprintf( stderr, "\t-d url\t\t[[ldap://][host[:port]]/]centroidentrydn\n"); - fprintf( stderr, "options:\n" ); - fprintf( stderr, "\t-v \t\tturn on verbose mode\n" ); - fprintf( stderr, "\t-n \t\tgenerate, but do not install index info\n" ); - fprintf( stderr, "\t-f filter\tentry selection filter\n" ); - fprintf( stderr, "\t-F \t\tgenerate a full centroid\n" ); - fprintf( stderr, "\t-R \t\tgenerate a relative centroid\n" ); - fprintf( stderr, "\t-w \t\tgenerate a word-based centroid\n" ); - fprintf( stderr, "\t-t directory\tcentroid directory\n" ); - fprintf( stderr, "\t-b binddn\tsource bind dn\n" ); - fprintf( stderr, "\t-p passwd\tsource bind passwd (for simple auth)\n" ); - fprintf( stderr, "\t-m authmethod\tsource authmethod \"simple\" or \"kerberos\"\n" ); - fprintf( stderr, "\t-B binddn\tdestination bind dn\n" ); - fprintf( stderr, "\t-P passwd\tdestination bind passwd (for simple auth)\n" ); - fprintf( stderr, "\t-M authmethod\tdestination authmethod \"simple\" or \"kerberos\"\n" ); - fprintf( stderr, "\t-c size\t\tldbm cache size\n" ); -} - -int -main( int argc, char **argv ) -{ - char *ldapfilter; - char *ldapsrcurl, *ldapdesturl; - LDAP *ld; - LDAPMod **mods; - char **attrs; - char **tmpfile; - LDBM *ldbm; - LDBM oldbm; - char buf[BUFSIZ]; - int i, j, k, count; - char *s; - - ldapsrcurl = NULL; - ldapdesturl = NULL; - ldaphost = NULL; - ldapbase = NULL; - srcldapauthmethod = LDAP_AUTH_SIMPLE; - destldapauthmethod = LDAP_AUTH_SIMPLE; - srcldapbinddn = NULL; - srcldappasswd = NULL; - destldapbinddn = NULL; - destldappasswd = NULL; - ldapfilter = DEFAULT_LDAPFILTER; - centroidvalues = CENTROID_VALUE; - centroidtype = CENTROID_RELATIVE; - centdir = NULL; - tmpfile = NULL; - ldbmcachesize = 0; - - while ( (i = getopt( argc, argv, "s:d:c:b:B:f:FRWp:P:m:M:t:vwn" )) - != EOF ) { - switch ( i ) { - case 's': /* source url [[ldap://][host[:port]]/]basedn */ - ldapsrcurl = strdup( optarg ); - break; - - case 'd': /* destination url [[ldap://][host[:port]]/]entrydn */ - ldapdesturl = strdup( optarg ); - break; - - case 'f': /* specify a filter */ - ldapfilter = strdup( optarg ); - break; - - case 'F': /* generate full centroid */ - centroidtype = CENTROID_FULL; - break; - - case 'R': /* generate relative centroid */ - centroidtype = CENTROID_RELATIVE; - break; - - case 'w': /* generate word centroid */ - centroidvalues = CENTROID_WORD; - break; - - case 'W': /* generate weights */ - doweights = 1; - break; - - case 't': /* temp file directory */ - centdir = strdup( optarg ); - break; - - case 'b': /* src bind dn */ - srcldapbinddn = strdup( optarg ); - break; - - case 'p': /* src bind password */ - srcldappasswd = strdup( optarg ); - while ( *optarg ) - *optarg++ = 'x'; - break; - - case 'B': /* dest bind dn */ - destldapbinddn = strdup( optarg ); - break; - - case 'P': /* dest bind password */ - destldappasswd = strdup( optarg ); - while ( *optarg ) - *optarg++ = 'x'; - break; - - case 'm': /* src bind method */ - if ( strcasecmp( optarg, "simple" ) == 0 ) { - srcldapauthmethod = LDAP_AUTH_SIMPLE; - } else if ( strcasecmp( optarg, "kerberos" ) == 0 ) { - srcldapauthmethod = LDAP_AUTH_KRBV4; - } else { - fprintf( stderr, "%s: unknown auth method\n", optarg ); - fputs( "expecting \"simple\" or \"kerberos\"\n", stderr ); - exit( EXIT_FAILURE ); - } - break; - - case 'M': /* dest bind method */ - if ( strcasecmp( optarg, "simple" ) == 0 ) { - destldapauthmethod = LDAP_AUTH_SIMPLE; - } else if ( strcasecmp( optarg, "kerberos" ) == 0 ) { - destldapauthmethod = LDAP_AUTH_KRBV4; - } else { - fprintf( stderr, "%s: unknown auth method\n", optarg ); - fputs( "expecting \"simple\" or \"kerberos\"\n", stderr ); - exit( EXIT_FAILURE ); - } - break; - - case 'c': /* ldbm cache size */ - ldbmcachesize = atoi( optarg ); - break; - - case 'v': /* turn on verbose mode */ - verbose++; - break; - - case 'n': /* don't actually install index info */ - not++; - break; - - default: - usage( argv[0] ); - exit( EXIT_FAILURE ); - } - } - if ( optind == argc || ldapsrcurl == NULL || ldapdesturl == NULL ) { - usage( argv[0] ); - exit( EXIT_FAILURE ); - } - attrs = &argv[optind]; - - /* - * open the ldap connection and start searching for the entries - * we will use to generate the centroids. - */ - - if ( (ld = start_ldap_search( ldapsrcurl, ldapfilter, attrs )) == NULL ) { - fprintf( stderr, "could not initiate ldap search\n" ); - exit( EXIT_FAILURE ); - } - - if ( create_tmp_files( attrs, &tmpfile, &ldbm ) != 0 ) { - fprintf( stderr, "could not create temp files\n" ); - exit( EXIT_FAILURE ); - } - - /* - * go through the entries returned, building a centroid for each - * attribute as we go. - */ - - if ( (count = generate_new_centroids( ld, attrs, ldbm )) < 1 ) { - if ( count == 0 ) { - fprintf( stderr, "no entries matched\n" ); - exit( EXIT_SUCCESS ); - } else { - fprintf( stderr, "could not generate new centroid\n" ); - exit( EXIT_FAILURE ); - } - } - - /* - * for each centroid we generated above, compare to the existing - * centroid, if any, and produce adds and deletes, or produce - * an entirely new centroid. in either case, update the "current" - * centroid version with the new one we just generated. - */ - - if ( (ld = bind_to_destination_ldap( ldapsrcurl, ldapdesturl )) == NULL ) { - fprintf( stderr, - "could not bind to index server, or could not create index entry\n" ); - exit( EXIT_FAILURE ); - } - - for ( i = 0; ldbm[i] != NULL; i++ ) { - /* generate the name of the existing centroid, if any */ - s = strrchr( tmpfile[i], '/' ); - *s = '\0'; - sprintf( buf, "%s/cent.%s", tmpfile[i], attrs[i] ); - *s = '/'; - - /* generate the full centroid changes */ - if ( centroidtype == CENTROID_FULL || (oldbm = ldbm_open( buf, - LDBM_WRITER, 0, ldbmcachesize )) == NULL ) { - if ( (mods = full_centroid( attrs[i], ldbm[i], count )) == NULL ) { - fprintf( stderr, "could not produce full centroid for %s\n", - attrs[i] ); - continue; - } - - /* generate the differential centroid changes */ - } else { - if ( (mods = diff_centroids( attrs[i], oldbm, ldbm[i], count )) - == NULL ) { - fprintf( stderr, "could not diff centroids\n" ); - ldbm_close( oldbm ); - continue; - } - ldbm_close( oldbm ); - } - - if ( verbose > 1 ) { - printf("changes:\n"); - for ( j = 0; mods[j] != NULL; j++ ) { - switch( mods[j]->mod_op ) { - case LDAP_MOD_ADD: - printf( "\tadd: %s\n",mods[j]->mod_type ); - break; - case LDAP_MOD_DELETE: - printf( "\tdelete: %s\n",mods[j]->mod_type ); - break; - case LDAP_MOD_REPLACE: - printf( "\treplace: %s\n",mods[j]->mod_type ); - break; - } - if ( mods[j]->mod_values != NULL ) { - for ( k = 0; mods[j]->mod_values[k] != NULL; k++ ) { - printf( "\t\t%s\n", mods[j]->mod_values[k] ); - } - } - } - printf("end changes:\n"); - } - - if ( verbose ) { - printf( "%sModifying centroid...", not ? "Not " : "" ); - fflush( stdout ); - } - - /* attempt to make the changes to the index server entry */ - if ( !not && ldap_modify_s( ld, ldapbase, mods ) != LDAP_SUCCESS ) { - fprintf( stderr, "could not apply centroid modification for %s\n", - attrs[i] ); - ldap_perror( ld, ldapbase ); - } - ldap_mods_free( mods, 1 ); - - if ( verbose ) { - printf( "\n" ); - fflush( stdout ); - } - - /* move the new centroid into the old one's place */ - if ( ! not ) { - (void) unlink( buf ); - if ( link( tmpfile[i], buf ) != 0 ) { - perror( "link" ); - fprintf( stderr, "could not rename %s to %s\n", buf, - tmpfile[i] ); - continue; - } - } - (void) unlink( tmpfile[i] ); - } - - /* clean up */ - for ( i = 0; attrs[i] != NULL; i++ ) { - ldbm_close( ldbm[i] ); - free( tmpfile[i] ); - } - free( ldbm ); - free( tmpfile ); - - exit( EXIT_SUCCESS ); -} - -/* - * open an ldap connection, bind, and initiate the search - */ - -static LDAP * -start_ldap_search( - char *ldapsrcurl, - char *ldapfilter, - char **attrs -) -{ - LDAP *ld; - char *s, *s2; - int i; - - if ( strncmp( ldapsrcurl, "ldap://", 7 ) != 0 ) { - fputs( "Not an LDAP URL", stderr ); /* Should be smarter? */ - return( NULL ); - } - s = ldapsrcurl + 7; - if ( (s2 = strchr( s, '/' )) == NULL ) { - ldapbase = strdup( s ); - } else { - if ( *s != '/' ) { - *s2 = '\0'; - ldaphost = strdup( s ); - *s2 = '/'; - } - ldapbase = strdup( s2 + 1 ); - } - - if ( verbose ) { - printf( "Base: %s\n", ldapbase ); - printf( "Attributes:" ); - for ( i = 0; attrs[i] != NULL; i++ ) { - printf( " %s", attrs[i] ); - } - printf( "\n" ); - printf( "Binding to source LDAP server..." ); - fflush( stdout ); - } - - if ( (ld = ldap_init( ldaphost, 0 )) == NULL ) { - perror( "ldap_init" ); - return( NULL ); - } - - if ( ldap_bind_s( ld, srcldapbinddn, srcldappasswd, srcldapauthmethod ) - != LDAP_SUCCESS) { - ldap_perror( ld, "ldap_bind_s" ); - ldap_unbind( ld ); - return( NULL ); - } - - printf( "\nInitiating search..." ); - if ( ldap_search( ld, ldapbase, LDAP_SCOPE_SUBTREE, ldapfilter, attrs, 0 ) - == -1 ) { - ldap_perror( ld, "ldap_search" ); - ldap_unbind( ld ); - return( NULL ); - } - - if ( verbose ) { - printf( "\n" ); - } - - return( ld ); -} - -/* - * create the temporary ldbm files we will use to hold the new centroids - */ - -static int -create_tmp_files( - char **attrs, - char ***tmpfile, - LDBM **ldbm -) -{ - int i; - - for ( i = 0; attrs[i] != NULL; i++ ) - ; /* NULL */ - i++; - - if ( (*tmpfile = (char **) malloc( i * sizeof(char *) )) == NULL ) { - perror( "malloc" ); - return( -1 ); - } - if ( (*ldbm = (LDBM *) malloc( i * sizeof(LDBM) )) == NULL ) { - perror( "malloc" ); - return( -1 ); - } - for ( i = 0; attrs[i] != NULL; i++ ) { - if ( ((*tmpfile)[i] = tempnam( centdir, NULL )) == NULL ) { - perror( "tmpnam" ); - return( -1 ); - } - - if ( ((*ldbm)[i] = ldbm_open( (*tmpfile)[i], LDBM_WRCREAT, 0600, - ldbmcachesize )) == NULL ) { - fprintf( stderr, "ldbm_open of \"%s\" failed\n", (*tmpfile)[i] ); - perror( "ldbm_open" ); - return( -1 ); - } - } - (*tmpfile)[i] = NULL; - (*ldbm)[i] = NULL; - - return( 0 ); -} - -/* - * step through each entry returned from the search and generate - * the appropriate centroid values. - */ - -static int -generate_new_centroids( - LDAP *ld, - char **attrs, - LDBM *ldbm -) -{ - Datum key, data; - int rc, i, j, count; - LDAPMessage *res, *e; - char *dn, *s, *w; - char **val; - char last; - - ldbm_datum_init( data ); - - if ( verbose ) { - printf( "Generating new centroids for..." ); - fflush( stdout ); - } - - data.dptr = ""; - data.dsize = 1; - count = 0; - while ( (rc = ldap_result( ld, LDAP_RES_ANY, 0, NULL, &res )) - == LDAP_RES_SEARCH_ENTRY ) { - count++; - e = ldap_first_entry( ld, res ); - dn = ldap_get_dn( ld, e ); - - /* for each attr we want to generate a centroid for */ - for ( i = 0; attrs[i] != NULL; i++ ) { - if ( (val = ldap_get_values( ld, e, attrs[i] )) == NULL ) { - continue; - } - - /* for each value */ - for ( j = 0; val[j] != NULL; j++ ) { - - ldbm_datum_init( key ); - - /* normalize the value */ - for ( s = val[j]; *s; s++ ) { - *s = TOLOWER( (unsigned char) *s ); - last = *s; - } - if ( isascii( last ) && isdigit( last ) ) { - continue; - } - - /* generate a value-based centroid */ - if ( centroidvalues == CENTROID_VALUE ) { - key.dptr = val[j]; - key.dsize = strlen( key.dptr ) + 1; - (void) ldbm_store( ldbm[i], key, data, LDBM_INSERT ); - - /* generate a word-based centroid */ - } else { - char *lasts; - for ( w = ldap_pvt_strtok( val[j], WORD_BREAKS, &lasts ); - w != NULL; - w = ldap_pvt_strtok( NULL, WORD_BREAKS, &lasts ) ) { - key.dptr = w; - key.dsize = strlen( key.dptr ) + 1; - (void) ldbm_store( ldbm[i], key, data, LDBM_INSERT ); - } - } - } - ldap_value_free( val ); - } - free( dn ); - ldap_msgfree( res ); - } - ldap_msgfree( res ); - ldap_unbind( ld ); - - if ( verbose ) { - printf( "%d entries\n", count ); - } - - return( count ); -} - -/* - * compare the old and new centroids, generating the appropriate add - * and delete operations. if the underlying database is ordered, we - * can do this more efficiently. - */ - -static LDAPMod ** -diff_centroids( - char *attr, - LDBM oldbm, - LDBM nldbm, - int nentries -) -{ -#ifdef LDBM_ORDERED - Datum okey, nkey; - Datum olast, nlast; -#endif - Datum lastkey, key; - Datum data; - LDAPMod **mods; - char **avals, **dvals; - int amax, acur, dmax, dcur; - char **vals; - - LDBMCursor *ocursorp; - LDBMCursor *ncursorp; - - if ( verbose ) { - printf( "Generating mods for differential %s centroid...", attr ); - fflush( stdout ); - } - - ldbm_datum_init( lastkey ); - ldbm_datum_init( key ); - ldbm_datum_init( data ); - - if ( (mods = (LDAPMod **) malloc( sizeof(LDAPMod *) * 4 )) == NULL || - (mods[0] = (LDAPMod *) malloc( sizeof(LDAPMod) )) == NULL || - (mods[1] = (LDAPMod *) malloc( sizeof(LDAPMod) )) == NULL || - (mods[2] = (LDAPMod *) malloc( sizeof(LDAPMod) )) == NULL || - (vals = (char **) malloc( 2 * sizeof(char *) )) == NULL || - (vals[0] = (char *) malloc( 20 )) == NULL ) - { - perror( "malloc" ); - exit( EXIT_FAILURE ); - } - /* add values in mods[0] */ - mods[0]->mod_op = LDAP_MOD_ADD; - mods[0]->mod_type = attr; - mods[0]->mod_values = NULL; - avals = NULL; - acur = amax = 0; - /* delete values in mods[1] */ - mods[1]->mod_op = LDAP_MOD_DELETE; - mods[1]->mod_type = attr; - mods[1]->mod_values = NULL; - dvals = NULL; - dcur = dmax = 0; - /* number of entries in mods[2] */ - sprintf( vals[0], "%d", nentries ); - vals[1] = NULL; - mods[2]->mod_op = LDAP_MOD_REPLACE; - mods[2]->mod_type = "nentries"; - mods[2]->mod_values = vals; - /* null terminate list of mods */ - mods[3] = NULL; - -#ifdef LDBM_ORDERED - /* - * if the underlying database is ordered, we can do a more efficient - * dual traversal, yielding O(N) performance. - */ - - ldbm_datum_init( okey ); - ldbm_datum_init( nkey ); - ldbm_datum_init( olast ); - ldbm_datum_init( nlast ); - - olast.dptr = NULL; - nlast.dptr = NULL; - - for ( okey = ldbm_firstkey( oldbm, &ocursorp ), - nkey = ldbm_firstkey( nldbm, &ncursorp ); - okey.dptr != NULL && nkey.dptr != NULL; ) - { - int rc = strcmp( okey.dptr, nkey.dptr ); - - if ( rc == 0 ) { - /* value is in both places - leave it */ - if ( olast.dptr != NULL ) { - ldbm_datum_free( oldbm, olast ); - } - olast = okey; - if ( nlast.dptr != NULL ) { - ldbm_datum_free( nldbm, nlast ); - } - nlast = nkey; - - okey = ldbm_nextkey( oldbm, olast, ocursorp ); - nkey = ldbm_nextkey( nldbm, nlast, ncursorp ); - - } else if ( rc > 0 ) { - /* new value is not in old centroid - add it */ - if ( charray_add_dup( &avals, &acur, &amax, nkey.dptr ) == NULL ) { - ldap_mods_free( mods, 1 ); - return( NULL ); - } - - if ( nlast.dptr != NULL ) { - ldbm_datum_free( nldbm, nlast ); - } - nlast = nkey; - - nkey = ldbm_nextkey( nldbm, nlast, ncursorp ); - - } else { - /* old value is not in new centroid - delete it */ - if ( charray_add_dup( &dvals, &dcur, &dmax, okey.dptr ) == NULL ) { - ldap_mods_free( mods, 1 ); - return( NULL ); - } - - if ( olast.dptr != NULL ) { - ldbm_datum_free( oldbm, olast ); - } - olast = okey; - - okey = ldbm_nextkey( oldbm, olast, ocursorp ); - } - } - - while ( okey.dptr != NULL ) { - if ( charray_add_dup( &dvals, &dcur, &dmax, okey.dptr ) == NULL ) { - ldap_mods_free( mods, 1 ); - return( NULL ); - } - - okey = ldbm_nextkey( oldbm, olast, ocursorp ); - if ( olast.dptr != NULL ) { - ldbm_datum_free( oldbm, olast ); - } - olast = okey; - } - if ( olast.dptr != NULL ) { - ldbm_datum_free( oldbm, olast ); - } - while ( nkey.dptr != NULL ) { - if ( charray_add_dup( &avals, &acur, &amax, nkey.dptr ) == NULL ) { - ldap_mods_free( mods, 1 ); - return( NULL ); - } - - nkey = ldbm_nextkey( nldbm, nlast, ncursorp ); - if ( nlast.dptr != NULL ) { - ldbm_datum_free( nldbm, nlast ); - } - nlast = nkey; - } - if ( nlast.dptr != NULL ) { - ldbm_datum_free( nldbm, nlast ); - } -#else - /* - * if the underlying database is not ordered, we have to - * generate list of values to add by stepping through all new - * values and looking them up in the old centroid (not there => add), - * then stepping through all old values and looking them up in the - * new centroid (not there => delete). this yields O(Nf(N)) performance, - * where f(N) is the order to retrieve a single item. - */ - - /* generate list of values to add */ - lastkey.dptr = NULL; - for ( key = ldbm_firstkey( nldbm, &ncursorp ); key.dptr != NULL; - key = ldbm_nextkey( nldbm, lastkey, ncursorp ) ) - { - /* see if it's in the old one */ - data = ldbm_fetch( oldbm, key ); - - /* not there - add it */ - if ( data.dptr == NULL ) { - if ( charray_add_dup( &avals, &acur, &amax, key.dptr ) == NULL ) { - ldap_mods_free( mods, 1 ); - return( NULL ); - } - } else { - ldbm_datum_free( oldbm, data ); - } - if ( lastkey.dptr != NULL ) { - ldbm_datum_free( nldbm, lastkey ); - } - lastkey = key; - } - if ( lastkey.dptr != NULL ) { - ldbm_datum_free( nldbm, lastkey ); - } - - /* generate list of values to delete */ - lastkey.dptr = NULL; - for ( key = ldbm_firstkey( oldbm, &ocursorp ); key.dptr != NULL; - key = ldbm_nextkey( oldbm, lastkey, ocursorp ) ) - { - /* see if it's in the new one */ - data = ldbm_fetch( nldbm, key ); - - /* not there - delete it */ - if ( data.dptr == NULL ) { - if ( charray_add_dup( &dvals, &dcur, &dmax, key.dptr ) == NULL ) { - ldap_mods_free( mods, 1 ); - return( NULL ); - } - } else { - ldbm_datum_free( nldbm, data ); - } - if ( lastkey.dptr != NULL ) { - ldbm_datum_free( oldbm, lastkey ); - } - lastkey = key; - } - if ( lastkey.dptr != NULL ) { - ldbm_datum_free( oldbm, lastkey ); - } -#endif - - mods[0]->mod_values = avals; - mods[1]->mod_values = dvals; - - if ( verbose ) { - printf( "\n" ); - fflush( stdout ); - } - - if ( mods[1]->mod_values == NULL ) { - free( (char *) mods[1] ); - mods[1] = NULL; - } - if ( mods[0]->mod_values == NULL ) { - free( (char *) mods[0] ); - mods[0] = mods[1]; - mods[1] = NULL; - } - if ( mods[0] == NULL ) { - free( (char *) mods ); - return( NULL ); - } else { - return( mods ); - } -} - -static LDAPMod ** -full_centroid( - char *attr, - LDBM ldbm, - int nentries -) -{ - Datum key, lastkey; - LDAPMod **mods; - char **vals; - int vcur, vmax; - - LDBMCursor *cursorp; - - if ( verbose ) { - printf( "Generating mods for full %s centroid...", attr ); - fflush( stdout ); - } - - ldbm_datum_init( key ); - ldbm_datum_init( lastkey ); - - if ( (mods = (LDAPMod **) malloc( sizeof(LDAPMod *) * 3 )) == NULL || - (mods[0] = (LDAPMod *) malloc( sizeof(LDAPMod) )) == NULL || - (mods[1] = (LDAPMod *) malloc( sizeof(LDAPMod) )) == NULL || - (vals = (char **) malloc( 2 * sizeof(char *) )) == NULL || - (vals[0] = (char *) malloc( 20 )) == NULL ) - { - perror( "malloc" ); - exit( EXIT_FAILURE ); - } - mods[0]->mod_op = LDAP_MOD_REPLACE; - mods[0]->mod_type = attr; - mods[0]->mod_values = NULL; - sprintf( vals[0], "%d", nentries ); - vals[1] = NULL; - mods[1]->mod_op = LDAP_MOD_REPLACE; - mods[1]->mod_type = "nentries"; - mods[1]->mod_values = vals; - mods[2] = NULL; - - lastkey.dptr = NULL; - vals = NULL; - vcur = vmax = 0; - - for ( key = ldbm_firstkey( ldbm, &cursorp ); key.dptr != NULL; - key = ldbm_nextkey( ldbm, lastkey, cursorp ) ) - { - if ( charray_add_dup( &vals, &vcur, &vmax, key.dptr ) == NULL ) { - ldap_mods_free( mods, 1 ); - return( NULL ); - } - - if ( lastkey.dptr != NULL ) { - ldbm_datum_free( ldbm, lastkey ); - } - lastkey = key; - } - if ( lastkey.dptr != NULL ) { - ldbm_datum_free( ldbm, lastkey ); - } - mods[0]->mod_values = vals; - - if ( verbose ) { - printf( "\n" ); - fflush( stdout ); - } - - if ( mods[0]->mod_values == NULL ) { - free( (char *) mods[0] ); - free( (char *) mods ); - return( NULL ); - } else { - return( mods ); - } -} - -/* - * extract the destination ldap host, port, and base object for the - * server to receive the index information. then, open a connection, - * bind, and see if the entry exists. if not, create it and set things - * up so the centroid full and diff routines can modify it to contain - * the new centroid information. - */ - -static LDAP * -bind_to_destination_ldap( - char *ldapsrcurl, - char *ldapdesturl -) -{ - LDAP *ld; - LDAPMessage *res; - int rc; - char *s, *s2, *d; - char *attrs[2], *refvalues[2], *ocvalues[2]; - LDAPMod *mp[3]; - LDAPMod m[2]; - char buf[BUFSIZ]; - - if ( verbose ) { - printf( "Binding to destination LDAP server..." ); - fflush( stdout ); - } - - /* first, pick out the destination ldap server info */ - if ( ldapbase != NULL ) { - free( ldapbase ); - ldapbase = NULL; - } - if ( strncmp( ldapdesturl, "ldap://", 7 ) != 0 ) { - fputs( "Not an LDAP URL", stderr ); /* Should be smarter? */ - return( NULL ); - } - s = ldapdesturl + 7; - if ( (s2 = strchr( s, '/' )) == NULL ) { - ldapbase = strdup( s ); - } else { - if ( *s != '/' ) { - *s2 = '\0'; - if ( ldaphost != NULL ) - free( ldaphost ); - ldaphost = strdup( s ); - *s2 = '/'; - } - ldapbase = strdup( s2 + 1 ); - } - strcpy( buf, "ref=" ); - if ( strpbrk( ldapsrcurl, " ,;" ) != NULL ) { - strcat( buf, "\"" ); - } - for ( s = d = ldapsrcurl; *s; s++ ) { - if ( *s != '"' ) { - *d++ = *s; - } - } - *d = '\0'; - strcat( buf, ldapsrcurl ); - if ( strpbrk( ldapsrcurl, " ,;" ) != NULL ) { - strcat( buf, "\"" ); - } - strcat( buf, ", " ); - strcat( buf, ldapbase ); - free( ldapbase ); - ldapbase = strdup( buf ); - - if ( (ld = ldap_init( ldaphost, 0 )) == NULL ) { - perror( "ldap_init" ); - return( NULL ); - } - - if ( ldap_bind_s( ld, destldapbinddn, destldappasswd, destldapauthmethod ) - != LDAP_SUCCESS) { - ldap_perror( ld, "ldap_bind_s" ); - ldap_unbind( ld ); - return( NULL ); - } - if ( verbose ) { - printf( "\n" ); - } - - attrs[0] = "c"; - attrs[1] = NULL; - rc = ldap_search_s( ld, ldapbase, LDAP_SCOPE_BASE, "(objectclass=*)", - attrs, 0, &res ); - ldap_msgfree( res ); - - if ( rc == LDAP_NO_SUCH_OBJECT ) { - if ( verbose ) { - printf( "%sCreating centroid entry...", not ? "Not " : "" ); - fflush( stdout ); - } - - /* create the centroid index entry */ - m[0].mod_op = 0; - m[0].mod_type = "ref"; - refvalues[0] = ldapsrcurl; - refvalues[1] = NULL; - m[0].mod_values = refvalues; - m[1].mod_op = 0; - m[1].mod_type = "objectclass"; - ocvalues[0] = "indexentry"; - ocvalues[1] = NULL; - m[1].mod_values = ocvalues; - mp[0] = &m[0]; - mp[1] = &m[1]; - mp[2] = NULL; - - if ( !not && ldap_add_s( ld, ldapbase, mp ) != LDAP_SUCCESS ) { - ldap_perror( ld, ldapbase ); - ldap_unbind( ld ); - return( NULL ); - } - - if ( verbose ) { - printf( "\n" ); - fflush( stdout ); - } - } else if ( rc != LDAP_SUCCESS ) { - ldap_perror( ld, "ldap_search_s" ); - ldap_unbind( ld ); - return( NULL ); - } - - return( ld ); -} - -static char ** -charray_add_dup( - char ***a, - int *cur, - int *max, - char *s -) -{ - if ( *a == NULL ) { - *a = (char **) malloc( (BUFSIZ + 1) * sizeof(char *) ); - *cur = 0; - *max = BUFSIZ; - } else if ( *cur >= *max ) { - *max += BUFSIZ; - *a = (char **) realloc( *a, (*max + 1) * sizeof(char *) ); - } - if ( *a == NULL ) { - return( NULL ); - } - - (*a)[(*cur)++] = strdup( s ); - (*a)[*cur] = NULL; - return( *a ); -} diff --git a/servers/slapd/tools/ldbmtest.c b/servers/slapd/tools/ldbmtest.c deleted file mode 100644 index ab95138393..0000000000 --- a/servers/slapd/tools/ldbmtest.c +++ /dev/null @@ -1,796 +0,0 @@ -/* $OpenLDAP$ */ -/* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file - */ -#include "portable.h" - -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_SYS_RESOURCE_H -#include -#endif -#ifdef HAVE_SYS_PARAM_H -#include -#endif -#include - -#ifdef HAVE_FCNTL_H -#include -#endif - -#ifdef HAVE_IO_H -#include -#endif - -#include "../slap.h" -#include "../back-ldbm/back-ldbm.h" - -static DBCache *openchoice(char c, int mode, int verbose, char **fname); -static void print_entry(FILE *fp, char c, Datum *key, char *klabel, Datum *data, char *dlabel); -static void free_and_close(DBCache *dbc, Datum key, Datum data); -static void edit_entry(char c, Datum *data); -static void get_keydata(FILE *fp, char c, Datum *key, Datum *data); - -static DBCache *dbc; -static LDBM dbp; -static Backend *be = NULL; - -int -main( int argc, char **argv ) -{ - char buf[256]; - Datum savekey, key, data, last; - char *fname; - ID id, cursor; - ID_BLOCK *idl; - Backend *tbe; - int i; - char *tailorfile; - - LDBMCursor *cursorp; - - fprintf(stderr, - "ldbmtest not updated to support new index formats!\n" ); - exit( EXIT_FAILURE ); - - - ldbm_datum_init( savekey ); - ldbm_datum_init( key ); - ldbm_datum_init( data ); - ldbm_datum_init( last ); - - tailorfile = SLAPD_DEFAULT_CONFIGFILE; - while ( (i = getopt( argc, argv, "d:f:" )) != EOF ) { - switch ( i ) { - case 'd': /* turn on debugging */ - ldap_debug = atoi( optarg ); - break; - - case 'f': /* specify a tailor file */ - tailorfile = strdup( optarg ); - break; - - default: - fprintf( stderr, - "usage: %s [-d level] [-f slapdconfigfile]\n", - argv[0] ); - exit( EXIT_FAILURE ); - } - } - - /* - * initialize stuff and figure out which backend we're dealing with - */ - - slap_init(SLAP_TOOL_MODE, "ldbmtest"); - read_config( tailorfile ); - slap_startup( NULL ); - - while ( 1 ) { - printf( "dbtest: " ); - - if ( fgets( buf, sizeof(buf), stdin ) == NULL ) - break; - - switch ( buf[0] ) { - case 'c': /* create an index */ - fname = NULL; - if ( (dbc = openchoice( buf[1], LDBM_READER, 0, - &fname )) != NULL ) { - printf( "Already exists\n" ); - ldbm_close( dbc->dbc_db ); - break; - } - if ( (dbc = openchoice( buf[1], LDBM_WRCREAT, 1, - &fname )) != NULL ) { - ldbm_close( dbc->dbc_db ); - } - break; - - case 'l': /* lookup something in an index */ - if ( (dbc = openchoice( buf[1], LDBM_READER, 1, NULL )) - == NULL ) { - continue; - } - - get_keydata( stdin, buf[1], &key, NULL ); - data = ldbm_fetch( dbc->dbc_db, key ); - print_entry( stdout, buf[1], &key, "key: ", &data, - "data:\n" ); - - free_and_close( dbc, key, data ); - break; - - case 'L': /* get all blocks for a key from an index */ - if ( (dbc = openchoice( buf[1], LDBM_READER, 1, NULL )) - == NULL ) { - continue; - } - - get_keydata( stdin, buf[1], &key, NULL ); - if ( (idl = idl_fetch( be, dbc, key )) != NULL ) { - data.dptr = (char *) idl; - data.dsize = (ID_BLOCK_NMAX(idl) + 1) * sizeof(ID); - print_entry( stdout, buf[1], &key, "key: ", - &data, "data:\n" ); - } - free_and_close( dbc, key, data ); - break; - - case 't': /* traverse */ - case 'T': /* traverse - keys only */ - if ( (dbc = openchoice( buf[1], LDBM_READER, 1, NULL )) - == NULL ) { - perror( "openchoice" ); - continue; - } - - savekey.dptr = NULL; - for ( key = ldbm_firstkey( dbc->dbc_db, &cursorp ); - key.dptr != NULL; - key = ldbm_nextkey( dbc->dbc_db, key, cursorp ) ) - { - if ( savekey.dptr != NULL ) - ldbm_datum_free( dbc->dbc_db, savekey ); - savekey = key; - - data = ldbm_fetch( dbc->dbc_db, key ); - - if ( buf[0] == 't' ) { - print_entry( stdout, buf[1], &key, - "key: ", &data, "data:\n" ); - } else { - print_entry( stdout, buf[1], &key, - "key: ", NULL, NULL ); - } - - if ( data.dptr != NULL ) { - ldbm_datum_free( dbc->dbc_db, data ); - } - } - if ( savekey.dptr != NULL ) - ldbm_datum_free( dbc->dbc_db, savekey ); - - ldbm_close( dbc->dbc_db ); - break; - - case 'x': /* delete an entry */ - if ( (dbc = openchoice( buf[1], LDBM_WRITER, 1, NULL )) - == NULL ) { - continue; - } - - get_keydata( stdin, buf[1], &key, NULL ); - - if ( ldbm_delete( dbc->dbc_db, key ) != 0 ) { - if ( ldbm_errno( dbc->dbc_db ) == 0 ) { - perror( "ldbm_delete" ); - } else { - fprintf( stderr, "db_errno=%d", - ldbm_errno( dbc->dbc_db ) ); - } - } - - data.dptr = NULL; - free_and_close( dbc, key, data ); - break; - -#ifndef HAVE_WINSOCK - case 'e': /* edit an entry */ - if ( (dbc = openchoice( buf[1], LDBM_WRITER, 1, NULL )) - == NULL ) { - continue; - } - - get_keydata( stdin, buf[1], &key, NULL ); - - data = ldbm_fetch( dbc->dbc_db, key ); - if ( data.dptr == NULL ) { - if ( ldbm_errno( dbc->dbc_db ) == 0 ) { - perror( "ldbm_fetch" ); - } else { - fprintf( stderr, "db_errno=%d\n", - ldbm_errno( dbc->dbc_db ) ); - } - free_and_close( dbc, key, data ); - break; - } - - edit_entry( buf[1], &data ); - - if ( data.dptr == NULL ) { - if ( ldbm_delete( dbc->dbc_db, key ) != 0 ) { - perror( "ldbm_delete" ); - } - } else if ( ldbm_store( dbc->dbc_db, key, data, - LDBM_REPLACE ) != 0 ) { - if ( ldbm_errno( dbc->dbc_db ) == 0 ) { - perror( "ldbm_store" ); - } else { - fprintf( stderr, "db_errno=%d\n", - ldbm_errno( dbc->dbc_db ) ); - } - } - - free_and_close( dbc, key, data ); - break; -#endif - - case 'a': /* add an entry */ - if ( (dbc = openchoice( buf[1], LDBM_WRITER, 1, NULL )) - == NULL ) { - continue; - } - - get_keydata( stdin, buf[1], &key, &data ); - - if ( ldbm_store( dbc->dbc_db, key, data, LDBM_INSERT ) - != 0 ) { - if ( ldbm_errno( dbc->dbc_db ) == 0 ) { - perror( "ldbm_store" ); - } else { - fprintf( stderr, "db_errno=%d\n", - ldbm_errno( dbc->dbc_db ) ); - } - } - - free_and_close( dbc, key, data ); - break; - - case 'i': /* insert an id into an index entry */ - if ( (dbc = openchoice( buf[1], LDBM_WRITER, 1, NULL )) - == NULL ) { - continue; - } - - get_keydata( stdin, buf[1], &key, &data ); - - idl = (ID_BLOCK *) data.dptr; - for ( id = idl_firstid( idl, &cursor ); id != NOID; - id = idl_nextid( idl, &cursor ) ) { - if ( idl_insert_key( be, dbc, key, id ) - != 0 ) { - fprintf( stderr, - "idl_insert_key (%s) %ld failed\n", - key.dptr, id ); - continue; - } - } - - free_and_close( dbc, key, data ); - break; - - case 'b': /* select a backend by suffix */ - printf( "suffix: " ); - fflush( stdout ); - if ( fgets( buf, sizeof(buf), stdin ) == NULL ) { - exit( EXIT_SUCCESS ); - } else { - buf[strlen( buf ) - 1] = '\0'; - } - (void) dn_normalize( buf ); - if ( (tbe = select_backend( buf )) == NULL ) { - fprintf( stderr, "unknown suffix \"%s\"\n", - buf ); - } else { - be = tbe; - } - break; - - case 'B': /* print current suffix */ - if ( be == NULL ) { - printf( "no current backend\n" ); - } else { - printf( "current backend has suffix \"%s\"\n", - be->be_suffix[0] ); - } - break; - - case 'C': /* produce concordance of an index */ - if ( (dbc = openchoice( 'i', LDBM_READER, 1, NULL )) - == NULL ) { - continue; - } - - last.dptr = NULL; - - for ( key = ldbm_firstkey( dbp, &cursorp ); - key.dptr != NULL; - key = ldbm_nextkey( dbp, last, cursorp ) ) - { - if ( last.dptr != NULL ) { - ldbm_datum_free( dbp, last ); - } - last = key; - printf( "key(%d): (%s)\n", key.dsize, - key.dptr ); - } - - free_and_close( dbc, key, last ); - break; - - default: - printf( "commands: l => lookup index\n" ); - printf( " L => lookup index (all)\n" ); - printf( " t => traverse index\n" ); - printf( " T => traverse index keys\n" ); - printf( " x => delete from index\n" ); - printf( " e => edit index entry\n" ); - printf( " a => add index entry\n" ); - printf( " c => create index\n" ); - printf( " i => insert ids into index\n" ); - printf( " b => change default backend\n" ); - printf( " B => print default backend\n" ); - printf( "where is a char selecting the index:\n" ); - printf( " d => dn2id\n" ); - printf( " e => id2entry\n" ); - printf( " f => arbitrary file\n" ); - printf( " i => attribute index\n" ); - break; - } - } - - slap_shutdown( NULL ); - slap_destroy(); - - return( EXIT_SUCCESS ); -} - -static void -free_and_close( DBCache *dbc, Datum key, Datum data ) -{ - ldbm_cache_really_close( be, dbc ); - if ( key.dptr != NULL ) - ldbm_datum_free( dbp, key ); - if ( data.dptr != NULL ) - ldbm_datum_free( dbp, data ); -} - -static int -dnid_cmp( const void *a, const void *b ) -{ - return( *(const long int *)a - *(const long int *)b ); -} - -static char * -myrealloc( char *p, int size ) -{ - if ( p == NULL ) - return( (char *) malloc( size ) ); - else - return( (char *) realloc( p, size ) ); -} - -static void -get_idlist( FILE *fp, Datum *data ) -{ - char buf[20]; - int i, fd, tty; - ID_BLOCK *p; - unsigned int psize, pmax; - unsigned int nmax, nids; - - fd = fileno( fp ); - tty = isatty( fd ); - - p = NULL; - psize = 2 * sizeof(ID); - pmax = 0; - nmax = 0; - nids = 0; - i = 0; - while ( 1 ) { - if ( tty ) - printf( "id? " ); - if ( fgets( buf, sizeof(buf), fp ) == NULL || buf[0] == '\n' ) - break; - if ( strncmp( buf, "nmax=", 5 ) == 0 ) { - nmax = atol( buf + 5 ); - continue; - } - - if ( psize + sizeof(ID) > pmax ) { - pmax += BUFSIZ; - p = (ID_BLOCK *) myrealloc( (char *) p, pmax ); - } - - if ( strncmp( buf, "nids=0", 6 ) == 0 ) { - nids = NOID; - continue; - } - - ID_BLOCK_ID(p,i++) = atol( buf ); - psize += sizeof(ID); - } - if ( nmax == 0 ) { - if ( tty ) { - nmax = i; - printf( "%d IDs entered. Max number of ids? [%d] ", i, - i ); - if ( fgets( buf, sizeof(buf), fp ) != NULL && - isdigit( (unsigned char) buf[0] ) ) { - nmax = atol( buf ); - } - } else { - nmax = i; - } - } - if ( i > 0 ) { - ID_BLOCK_NMAX(p) = nmax; - if ( nids != 0 ) { - ID_BLOCK_NIDS(p) = 0; - ID_BLOCK_ID(p,i) = NOID; - } else { - ID_BLOCK_NIDS(p) = i; - } - - qsort( (void *) &ID_BLOCK_ID(p, 0), i, sizeof(ID), dnid_cmp ); - } - - data->dptr = (char *) p; - data->dsize = (nmax + ID_BLOCK_IDS_OFFSET) * sizeof(ID); -} - -static void -get_entry( FILE *fp, Datum *data ) -{ - char buf[BUFSIZ]; - char *p; - unsigned int pmax, psize, len; - int fd; - - fd = fileno( fp ); - if ( isatty( fd ) ) - printf( "Enter entry, to end:\n" ); - - p = NULL; - pmax = psize = 0; - while ( fgets( buf, sizeof(buf), fp ) != NULL ) { - len = strlen( buf ); - if ( psize + strlen( buf ) > pmax ) { - pmax += BUFSIZ; - p = myrealloc( p, pmax ); - } - if ( psize == 0 ) - strcpy( p, buf ); - else - strcat( p, buf ); - psize += len; - - if ( buf[0] == '\n' ) - break; - } - - data->dptr = p; - data->dsize = psize + 1; -} - -#ifndef HAVE_WINSOCK -static void -edit_entry( char c, Datum *data ) -{ - int fd, pid; - char tmpname[20]; - FILE *fp; -#ifndef HAVE_WAITPID - WAITSTATUSTYPE status; -#endif - - strcpy( tmpname, LDAP_TMPDIR LDAP_DEFSEP "dbtestXXXXXX" ); -#ifndef HAVE_MKSTEMP - if ( (fd = open( mktemp( tmpname ), O_RDWR|O_CREAT|O_EXCL, 0600 )) == -1 ) { - perror( tmpname ); - return; - } -#else - if ( (fd = mkstemp( tmpname )) == -1 ) { - perror( tmpname ); - return; - } -#endif - - fp = fdopen( fd, "w" ); - print_entry( fp, c, NULL, NULL, data, NULL ); - fflush( fp ); - - pid = fork(); - - if ( pid == -1 ) { - perror( "fork" ); - return; - } else if ( pid == 0 ) { - char *editor; - - if ( (editor = getenv( "EDITOR" )) == NULL ) { - editor = LDAP_EDITOR; - } - execl( editor, editor, tmpname, NULL ); - perror( "execl" ); - exit( EXIT_FAILURE ); - } - - fclose( fp ); - -#ifdef HAVE_WAITPID - if ( waitpid( (pid_t) -1, NULL, WAIT_FLAGS ) < 0 ) -#else - if ( wait3( (pid_t) -1, &status, WAIT_FLAGS, 0 ) < 0 ) -#endif - { - perror( "wait" ); - return; - } - - if ( (fp = fopen( tmpname, "r" )) == NULL ) { - perror( tmpname ); - return; - } - if ( data->dptr != NULL ) { - ldbm_datum_free( NULL, *data ); - } - get_keydata( fp, c, NULL, data ); - fclose( fp ); - unlink( tmpname ); -} -#endif - -static DBCache * -openfile( char *name, int namesiz, int mode, int verbose, char c ) -{ - DBCache *dbc; - - if ( name == NULL || *name == '\0' ) { - if ( c == 'f' ) { - printf( " file: " ); - if ( fgets( name, namesiz, stdin ) == NULL ) - exit( EXIT_SUCCESS ); - name[strlen( name ) - 1] = '\0'; - } else { - printf( " attr: " ); - if ( fgets( name, namesiz, stdin ) == NULL ) - exit( EXIT_SUCCESS ); - name[strlen( name ) - 1] = '\0'; - } - } - - if ( (dbc = ldbm_cache_open( be, name, (c == 'f') ? "" : LDBM_SUFFIX, - LDBM_READER )) == NULL ) { - perror( name ); - } else { - dbp = dbc->dbc_db; - } - - return( dbc ); -} - -static DBCache * -openchoice( char c, int mode, int verbose, char **fname ) -{ - static char name[MAXPATHLEN]; - - switch ( c ) { - case 'd': /* dn2id */ - sprintf( name, "dn2id" ); - break; - case 'e': /* id2entry */ - sprintf( name, "id2entry" ); - break; - case 'f': /* arbitrary file */ - case 'i': /* index */ - if ( fname != NULL && *fname != NULL ) { - strcpy( name, *fname ); - } else { - name[0] = '\0'; - } - break; - default: - printf( "specify one of [fdei] to select file\n" ); - return( NULL ); - break; - } - if ( fname != NULL ) { - *fname = name; - } - - return( openfile( name, MAXPATHLEN, mode, verbose, c ) ); -} - -static void -print_entry( - FILE *fp, - char c, - Datum *key, - char *klabel, - Datum *data, - char *dlabel -) -{ - ID id; - ID_BLOCK *idl; - unsigned int i; - char msg[2]; - - if ( data != NULL && data->dptr == NULL ) { - msg[0] = c; - msg[1] = '\0'; - - if ( ldbm_errno( dbp ) == 0 ) - perror( msg ); - else - fprintf( stderr, "%s: db_errno=%d\n", msg, - ldbm_errno( dbp ) ); - return; - } - - switch ( c ) { - case 'd': /* dn2id - key is dn, data is dnid */ - if ( key != NULL ) - fprintf( fp, "%s%s (len %d)\n", klabel, key->dptr, - key->dsize ); - if ( data != NULL ) { - SAFEMEMCPY( (char *) &id, data->dptr, sizeof(ID) ); - fprintf( fp, "%s%ld\n", dlabel ? dlabel : "", id ); - } - break; - - case 'e': /* id2entry - key is dnid, data is entry */ - if ( key != NULL ) { - SAFEMEMCPY( (char *) &id, key->dptr, sizeof(ID) ); - fprintf( fp, "%s %ld\n", klabel, id ); - } - if ( data != NULL ) { - if ( dlabel ) { - fprintf( fp, "data length: %d\n", data->dsize ); - fputs( dlabel, fp ); - } - fputs( data->dptr, fp ); - } - break; - - case 'i': /* index - key is string, data is dnid[] */ - if ( key != NULL ) - fprintf( fp, "%s%s (len %d)\n", klabel, key->dptr, - key->dsize ); - if ( data != NULL ) { - idl = (ID_BLOCK *) data->dptr; - - if ( dlabel ) - fprintf( fp, "%s\tnmax=%ld\n\tncur=%ld\n", dlabel, - ID_BLOCK_NMAX(idl), ID_BLOCK_NIDS(idl) ); - - if ( ID_BLOCK_INDIRECT( idl ) ) { - for ( i = 0; !ID_BLOCK_NOID(idl, i); i++ ) { - fprintf( fp, "\t%ld\n", ID_BLOCK_ID(idl, i) ); - } - } else if ( ID_BLOCK_ALLIDS( idl ) ) { - fprintf( fp, "\tALLIDS\n" ); - } else { - for ( i = 0; i < ID_BLOCK_NIDS(idl); i++ ) { - fprintf( fp, "\t%ld\n", ID_BLOCK_ID(idl,i) ); - } - } - } - break; - - case 'f': /* arbitrary file - assume key & data are strings */ - if ( key != NULL ) - fprintf( fp, "%s%s\n", klabel, key->dptr ); - if ( data != NULL ) { - fprintf( fp, "%s%s\n", dlabel ? dlabel : "", - data->dptr ); - } - break; - - default: - fprintf( stderr, "specify [dei] to select a file\n" ); - break; - } -} - -static void -get_keydata( FILE *fp, char c, Datum *key, Datum *data ) -{ - static char kbuf[BUFSIZ], dbuf[BUFSIZ]; - long n; - int fd, tty; - - fd = fileno( fp ); - tty = isatty( fd ); - - switch ( c ) { - case 'd': /* dn2id - key is dn, data is dnid */ - if ( key != NULL ) { - if ( tty ) - printf( " dn: " ); - if ( fgets( kbuf, sizeof(kbuf), fp ) == NULL ) { - exit( EXIT_SUCCESS ); - } - kbuf[strlen( kbuf ) - 1] = '\0'; - key->dptr = strdup( kbuf ); - key->dsize = strlen( kbuf ) + 1; - } - - if ( data != NULL ) { - if ( tty ) - printf( " dnid: " ); - if ( fgets( dbuf, sizeof(dbuf), fp ) == NULL ) { - exit( EXIT_SUCCESS ); - } - n = atol( dbuf ); - data->dptr = (char *) malloc( sizeof(n) ); - memcpy( data->dptr, (char *) &n, sizeof(n) ); - data->dsize = sizeof(n); - } - break; - - case 'e': /* id2entry - key is dnid, data is entry */ - if ( key != NULL ) { - if ( tty ) - printf( " dnid: " ); - if ( fgets( kbuf, sizeof(kbuf), fp ) == NULL ) { - exit( EXIT_SUCCESS ); - } - n = atol( kbuf ); - key->dptr = (char *) malloc( sizeof(n) ); - memcpy( key->dptr, (char *) &n, sizeof(n) ); - key->dsize = sizeof(n); - } - - if ( data != NULL ) { - get_entry( fp, data ); - } - break; - - case 'i': /* index - key is string, data is dnid[] */ - if ( key != NULL ) { - if ( tty ) - printf( " key: " ); - if ( fgets( kbuf, sizeof(kbuf), fp ) == NULL ) { - exit( EXIT_SUCCESS ); - } - kbuf[strlen( kbuf ) - 1] = '\0'; - key->dptr = strdup( kbuf ); - key->dsize = strlen( kbuf ) + 1; - } - - if ( data != NULL ) { - get_idlist( fp, data ); - } - break; - - default: - fprintf(stderr, "specify [dei] to select file type\n"); - break; - } -} - diff --git a/servers/slapd/tools/ldbmtest.dsp b/servers/slapd/tools/ldbmtest.dsp deleted file mode 100644 index 3f83351506..0000000000 --- a/servers/slapd/tools/ldbmtest.dsp +++ /dev/null @@ -1,148 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ldbmtest" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=ldbmtest - Win32 Single Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ldbmtest.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ldbmtest.mak" CFG="ldbmtest - Win32 Single Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ldbmtest - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ldbmtest - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "ldbmtest - Win32 Single Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ldbmtest - Win32 Single Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ldbmtest - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\Release" -# PROP Intermediate_Dir "..\..\..\Release\ldbmtest" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 libdb.lib libsasl.lib hs_regex.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release" - -!ELSEIF "$(CFG)" == "ldbmtest - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\Debug" -# PROP Intermediate_Dir "..\..\..\Debug\ldbmtest" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libdb.lib libsasl.lib hs_regex.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug" - -!ELSEIF "$(CFG)" == "ldbmtest - Win32 Single Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "ldbmtest" -# PROP BASE Intermediate_Dir "ldbmtest" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\SDebug" -# PROP Intermediate_Dir "..\..\..\SDebug\ldbmtest" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libdb.lib libsasl.lib hs_regex.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\SDebug" - -!ELSEIF "$(CFG)" == "ldbmtest - Win32 Single Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ldbmtes0" -# PROP BASE Intermediate_Dir "ldbmtes0" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\SRelease" -# PROP Intermediate_Dir "..\..\..\SRelease\ldbmtest" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 libdbs.lib libsasl.lib hs_regex.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\SRelease" - -!ENDIF - -# Begin Target - -# Name "ldbmtest - Win32 Release" -# Name "ldbmtest - Win32 Debug" -# Name "ldbmtest - Win32 Single Debug" -# Name "ldbmtest - Win32 Single Release" -# Begin Source File - -SOURCE=.\ldbmtest.c -# End Source File -# Begin Source File - -SOURCE=.\mimic.c -# End Source File -# End Target -# End Project diff --git a/servers/slapd/tools/ldbmtest.dsw b/servers/slapd/tools/ldbmtest.dsw deleted file mode 100644 index f7f142df57..0000000000 --- a/servers/slapd/tools/ldbmtest.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ldbmtest"=.\ldbmtest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/servers/slapd/tools/ldif.c b/servers/slapd/tools/ldif.c deleted file mode 100644 index 67124e0134..0000000000 --- a/servers/slapd/tools/ldif.c +++ /dev/null @@ -1,103 +0,0 @@ -/* $OpenLDAP$ */ -/* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file - */ -#include "portable.h" - -#include - -#include - -#include -#include -#include - -#ifdef HAVE_IO_H -#include -#endif - -#include - -#include "ldif.h" - -static void -usage( char *name ) -{ - fprintf( stderr, "usage: %s [-b] \n", name ); - exit( EXIT_FAILURE ); -} - -int -main( int argc, char **argv ) -{ - char buf[BUFSIZ]; - char *type, *out; - int len, binary = 0; - - if (argc < 2 || argc > 3 ) { - usage( argv[0] ); - } - if ( argc == 3 ) { - if ( strcmp( argv[1], "-b" ) != 0 ) { - usage( argv[0] ); - } - binary = 1; - type = argv[2]; - } else { - if ( strcmp( argv[1], "-b" ) == 0 ) { - usage( argv[0] ); - } - type = argv[1]; - } - - /* if the -b flag was used, read single binary value from stdin */ - if ( binary ) { - char *val; - int nread, max, cur; - - if (( val = (char *) malloc( BUFSIZ )) == NULL ) { - perror( "malloc" ); - return EXIT_FAILURE; - } - max = BUFSIZ; - cur = 0; - while ( (nread = read( 0, buf, BUFSIZ )) != 0 ) { - if ( nread + cur > max ) { - max += BUFSIZ; - if (( val = (char *) realloc( val, max )) == - NULL ) { - perror( "realloc" ); - return EXIT_FAILURE; - } - } - memcpy( val + cur, buf, nread ); - cur += nread; - } - - if (( out = ldif_put( LDIF_PUT_BINARY, type, val, cur )) == NULL ) { - perror( "ldif_type_and_value" ); - return EXIT_FAILURE; - } - - fputs( out, stdout ); - ber_memfree( out ); - free( val ); - return EXIT_SUCCESS; - } - - /* not binary: one value per line... */ - while ( fgets( buf, sizeof(buf), stdin ) != NULL ) { - if( buf[len=strlen(buf)] == '\n') buf[len] = '\0'; - - if (( out = ldif_put( LDIF_PUT_VALUE, type, buf, strlen( buf ) )) - == NULL ) { - perror( "ldif_type_and_value" ); - return EXIT_FAILURE; - } - fputs( out, stdout ); - ber_memfree( out ); - } - - return EXIT_SUCCESS; -} diff --git a/servers/slapd/tools/ldif.dsp b/servers/slapd/tools/ldif.dsp deleted file mode 100644 index 7b32bb1d41..0000000000 --- a/servers/slapd/tools/ldif.dsp +++ /dev/null @@ -1,145 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ldif" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=ldif - Win32 Single Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ldif.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ldif.mak" CFG="ldif - Win32 Single Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ldif - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "ldif - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "ldif - Win32 Single Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ldif - Win32 Single Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ldif - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\Release" -# PROP Intermediate_Dir "..\..\..\Release\ldif" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 libdb.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release" - -!ELSEIF "$(CFG)" == "ldif - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "ldif___W" -# PROP BASE Intermediate_Dir "ldif___W" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\Debug" -# PROP Intermediate_Dir "..\..\..\Debug\ldif" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libdb.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug" - -!ELSEIF "$(CFG)" == "ldif - Win32 Single Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "ldif___W" -# PROP BASE Intermediate_Dir "ldif___W" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\SDebug" -# PROP Intermediate_Dir "..\..\..\SDebug\ldif" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 oldif32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libraries\Debug" -# ADD LINK32 libdbs.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\SDebug" - -!ELSEIF "$(CFG)" == "ldif - Win32 Single Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ldif___0" -# PROP BASE Intermediate_Dir "ldif___0" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\SRelease" -# PROP Intermediate_Dir "..\..\..\SRelease\ldif" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 oldif32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\libraries\Release" -# ADD LINK32 libdbs.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\SRelease" - -!ENDIF - -# Begin Target - -# Name "ldif - Win32 Release" -# Name "ldif - Win32 Debug" -# Name "ldif - Win32 Single Debug" -# Name "ldif - Win32 Single Release" -# Begin Source File - -SOURCE=.\ldif.c -# End Source File -# End Target -# End Project diff --git a/servers/slapd/tools/ldif.dsw b/servers/slapd/tools/ldif.dsw deleted file mode 100644 index e2c9733495..0000000000 --- a/servers/slapd/tools/ldif.dsw +++ /dev/null @@ -1,59 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ldif"=.\ldif.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libldif - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblber - End Project Dependency -}}} - -############################################################################### - -Project: "liblber"=..\..\libraries\liblber\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldif"=..\..\libraries\libldif\libldif.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/servers/slapd/tools/sizecount.c b/servers/slapd/tools/sizecount.c deleted file mode 100644 index 8eca6bf1a6..0000000000 --- a/servers/slapd/tools/sizecount.c +++ /dev/null @@ -1,190 +0,0 @@ -/* $OpenLDAP$ */ -#include "portable.h" - -#include - -#include -#include -#include - -#include -#include - -#define CACHE_SIZE 1000000 -#define MODE 0600 -#define DB_FLAGS (LDBM_WRCREAT|LDBM_NEWDB) -#define SUBLEN 3 - -extern char *first_word(char *); -extern char *next_word(char *); -extern char *word_dup(char *); -extern char *phonetic(char *); - -extern int ldap_debug; - -int slap_debug; -int ldap_syslog; -int ldap_syslog_level; - -static void add(LDBM ldbm, char *s, int *count, int *size, int freeit); - -int -main( int argc, char **argv ) -{ - LDAP *ld; - LDAPMessage *res, *e; - int i, j, k, count, len, nentries; - int vcount, wcount, pcount, scount; - int vsize, wsize, psize, ssize; - struct berval **bvals; - char **vals; - char *dn, *p, *val; - char buf[SUBLEN+1]; - LDBM wldbm, pldbm, sldbm; - static char *attrs[] = { "cn", "nentries", NULL }; - -/* - ldap_debug = 255; -*/ - if ( (ld = ldap_init( "vertigo:5555", 0 )) == NULL ) { - perror( "ldap_init" ); - exit( EXIT_FAILURE ); - } - - if ( ldap_search( ld, "cn=index", LDAP_SCOPE_ONELEVEL, "(objectclass=*)", - attrs, 0 ) == -1 ) { - ldap_perror( ld, "ldap_search" ); - exit( EXIT_FAILURE ); - } - - printf( "attr\tdn\tnentries\tvcount\tvsize\twcount\twsize\tpcount\tpsize\tscount\tssize\n" ); - fflush( stdout ); - count = 0; - while ( ldap_result( ld, LDAP_RES_ANY, 0, NULL, &res ) - == LDAP_RES_SEARCH_ENTRY ) { - count++; - e = ldap_first_entry( ld, res ); - dn = ldap_get_dn( ld, e ); - if ( (vals = ldap_get_values( ld, e, "nentries" )) != NULL ) { - nentries = atoi( vals[0] ); - ldap_value_free( vals ); - } else { - fprintf( stderr, "no nentries attribute for (%s)\n", dn ); - nentries = -1; - } - - for ( i = 0; attrs[i] != NULL; i++ ) { - if ( strcasecmp( attrs[i], "nentries" ) == 0 ) { - continue; - } - if ( (wldbm = ldbm_open( "wcount.ldbm", DB_FLAGS, MODE, - CACHE_SIZE )) == NULL || (pldbm = ldbm_open( "pcount.ldbm", - DB_FLAGS, MODE, CACHE_SIZE )) == NULL || (sldbm = ldbm_open( - "scount.ldbm", DB_FLAGS, MODE, CACHE_SIZE )) == NULL ) { - perror( "ldbm_open" ); - exit( EXIT_FAILURE ); - } - vcount = 0; vsize = 0; - wcount = 0; wsize = 0; - pcount = 0; psize = 0; - scount = 0; ssize = 0; - if ( (bvals = ldap_get_values_len( ld, e, attrs[i] )) != NULL ) { - for ( j = 0; bvals[j] != NULL; j++ ) { - char *w; - - /* update value count */ - vcount++; - vsize += bvals[j]->bv_len; - - /* update word and phoneme counts */ - for ( w = first_word( bvals[j]->bv_val ); w != NULL; - w = next_word( w ) ) { - add( wldbm, word_dup( w ), &wcount, &wsize, 1 ); - - add( pldbm, phonetic( w ), &pcount, &psize, 1 ); - } - - /* update substring count */ - len = bvals[j]->bv_len; - val = bvals[j]->bv_val; - if ( len > SUBLEN - 2 ) { - buf[0] = '^'; - for ( k = 0; k < SUBLEN - 1; k++ ) { - buf[k + 1] = val[k]; - } - buf[SUBLEN] = '\0'; - add( sldbm, buf, &scount, &ssize, 0 ); - - p = val + len - SUBLEN + 1; - for ( k = 0; k < SUBLEN; k++ ) { - buf[k] = p[k]; - } - buf[SUBLEN - 1] = '$'; - buf[SUBLEN] = '\0'; - add( sldbm, buf, &scount, &ssize, 0 ); - } - for ( p = val; p < (val + len - SUBLEN + 1); p++ ) { - for ( k = 0; k < SUBLEN; k++ ) { - buf[k] = p[k]; - } - buf[SUBLEN] = '\0'; - add( sldbm, buf, &scount, &ssize, 0 ); - } - } - ldap_value_free_len( bvals ); - } - printf( "%s\t%s\t%d", attrs[i], dn, nentries ); - printf( "\t%d\t%d", vcount, vsize ); - printf( "\t%d\t%d", wcount, wsize ); - printf( "\t%d\t%d", pcount, psize ); - printf( "\t%d\t%d\n", scount, ssize ); - fflush( stdout ); - - ldbm_close( wldbm ); - ldbm_close( pldbm ); - ldbm_close( sldbm ); - } - - free( dn ); - ldap_msgfree( res ); - } - printf( "%d entries\n", count ); - fflush( stdout ); - - if ( ldap_result2error( ld, res, 1 ) != LDAP_SUCCESS ) { - ldap_perror( ld, "ldap_result" ); - } - ldap_unbind( ld ); - - (void) unlink( "wcount.ldbm" ); - (void) unlink( "pcount.ldbm" ); - (void) unlink( "scount.ldbm" ); - - exit( EXIT_SUCCESS ); -} - -static void -add( - LDBM ldbm, - char *s, - int *count, - int *size, - int freeit -) -{ - Datum key, data; - - ldbm_datum_init( key ); - ldbm_datum_init( data ); - - key.dptr = s; - key.dsize = strlen( key.dptr ) + 1; - data.dptr = ""; - data.dsize = 0; - if ( ldbm_store( ldbm, key, data, LDBM_INSERT ) == 0 ) { - (*count)++; - (*size) += strlen( key.dptr ); - } - if ( freeit && ( key.dptr != NULL ) ) - ldbm_datum_free( ldbm, key ); -} diff --git a/servers/slurpd/slurpd.dsw b/servers/slurpd/slurpd.dsw deleted file mode 100644 index 7a3db39721..0000000000 --- a/servers/slurpd/slurpd.dsw +++ /dev/null @@ -1,53 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "liblber"=..\..\libraries\liblber\liblber.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libldap_r"=..\..\libraries\libldap_r\libldap_r.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "slurpd"=.\slurpd.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - -- 2.39.5