From 334768c1bbb867f5a5a31d78f20152de5526c2ba Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sun, 10 Jan 1999 02:25:41 +0000 Subject: [PATCH] Update build environment to fix VPATH support. make depend, make tests, and make install all work when build directory is not the $srcdir. Also modified library handling such that -lpthread more likely to be last. WARNING: new orderring requires use of LDFLAGS to set global loader options such as -L/usr/local/lib. If you put this in LIBS, some libraries may not be found a link time. Likely broke Kerberos/LDAPD support. Don't have those in my testbed. --- acconfig.h | 12 + build/man.mk | 1 + build/mkdep | 79 ++-- build/top.mk | 42 +- clients/fax500/Makefile.in | 3 + clients/finger/Makefile.in | 3 + clients/gopher/Makefile.in | 5 +- clients/mail500/Makefile.in | 3 + clients/rcpt500/Makefile.in | 5 +- clients/tools/Makefile.in | 7 +- clients/ud/Makefile.in | 3 +- configure | 626 ++++++++++++++++-------------- configure.in | 21 +- include/Makefile.in | 10 +- include/portable.h.in | 12 + libraries/libavl/Makefile.in | 2 +- libraries/liblber/Makefile.in | 2 +- libraries/libldap/Makefile.in | 10 +- libraries/libldap_r/Makefile.in | 2 +- libraries/libldbm/Makefile.in | 2 +- libraries/liblthread/Makefile.in | 2 +- servers/ldapd/Makefile.in | 2 +- servers/slapd/Makefile.in | 11 +- servers/slapd/back-shell/shell.h | 8 +- servers/slapd/tools/Makefile.in | 13 +- servers/slurpd/Makefile.in | 6 +- tests/Makefile.in | 9 +- tests/scripts/all | 13 +- tests/scripts/defines.sh | 28 +- tests/scripts/test001-ldif2ldbm | 11 +- tests/scripts/test001-slapadd | 11 +- tests/scripts/test002-populate | 11 +- tests/scripts/test003-search | 8 +- tests/scripts/test004-modify | 8 +- tests/scripts/test005-modrdn | 9 +- tests/scripts/test006-acls | 10 +- tests/scripts/test007-replication | 8 +- 37 files changed, 609 insertions(+), 409 deletions(-) diff --git a/acconfig.h b/acconfig.h index 7280eef913..5fba05cd25 100644 --- a/acconfig.h +++ b/acconfig.h @@ -10,14 +10,26 @@ /* define this if needed to get reentrant functions */ +#ifndef REENTRANT #undef REENTRANT +#endif +#ifndef _REENTRANT #undef _REENTRANT +#endif /* define this if needed to get threadsafe functions */ +#ifndef THREADSAFE #undef THREADSAFE +#endif +#ifndef _THREADSAFE #undef _THREADSAFE +#endif +#ifndef THREAD_SAFE #undef THREAD_SAFE +#endif +#ifndef _THREAD_SAFE #undef _THREAD_SAFE +#endif /* define this if cross compiling */ #undef CROSS_COMPILING diff --git a/build/man.mk b/build/man.mk index 259112c291..3a4e6186d1 100644 --- a/build/man.mk +++ b/build/man.mk @@ -12,6 +12,7 @@ install-common: FORCE -$(MKDIR) -p $(MANDIR) @TMPMAN=/tmp/ldapman.$$$$$(MANCOMPRESSSUFFIX); \ VERSION=`$(CAT) $(VERSIONFILE)`; \ + cd $(srcdir); \ for page in *.$(MANSECT); do \ $(SED) -e "s%LDVERSION%$$VERSION%" \ -e 's%ETCDIR%$(sysconfdir)%' \ diff --git a/build/mkdep b/build/mkdep index fbaea123b4..102b932ebc 100755 --- a/build/mkdep +++ b/build/mkdep @@ -26,14 +26,26 @@ set -e # exit immediately if any errors occur MAKE=Makefile # default makefile name is "Makefile" NOSLASH="no" # by default, / dependencies are included CC=${CC-cc} # default compiler is cc +SRCDIR="" +SED=cat while : do case "$1" in + # the -s flag removes dependencies to files that begin with / + -s) + NOSLASH=yes; + shift ;; + # -f allows you to select a makefile name -f) MAKE=$2 shift; shift ;; + # -d allows you to select a VPATH directory + -d) + SRCDIR=$2 + shift; shift ;; + # -c allows you to select a compiler to use (default is cc) -c) CC=$2 @@ -42,18 +54,13 @@ while : # the -p flag produces "program: program.c" style dependencies # so .o's don't get produced -p) - SED='s;\.o;;' + SED='sed -e s;\.o;;' shift ;; # the -l flag produces libtool compatible dependencies -l) - SED='s;\.o:;.lo:;' - shift ;; - - # the -s flag removes dependencies to files that begin with / - -s) - NOSLASH=yes; + SED='sed -e s;\.o:;.lo:;' shift ;; # -*) shift ;; @@ -64,7 +71,7 @@ while : done if [ $# = 0 ] ; then - echo 'usage: mkdep [-p] [-s] [-c cc] [-f makefile] [flags] file ...' + echo 'usage: mkdep [-p] [-s] [-c cc] [-f makefile] [-d srcdir] [flags] file ...' exit 1 fi @@ -95,10 +102,34 @@ _EOF_ # egrep '^#include[ ]*".*"' /dev/null $* | # sed -e 's/:[^"]*"\([^"]*\)".*/: \1/' -e 's/\.c/.o/' | -$CC -M $* | -sed " - s; \./; ;g - $SED" | +if test "x$SRCDIR" = "x" ; then + files=$* +else + files= + for i in $* ; do + if test -f $i ; then + files="$files $i" + elif test -f $SRCDIR/$i ; then + files="$files $SRCDIR/$i" + else + files="$files $i" + fi + done + CC="$CC -I$SRCDIR" +fi + +cat << _EOF_ >> $TMP + +# +# files: $* +# command: $CC -M $files +# + +_EOF_ + +$CC -M $files | \ + sed -e 's; \./; ;g' | \ + $SED | \ awk ' $1 ~ /:/ { filenm=$1 @@ -108,25 +139,13 @@ $1 !~ /:/ { dep=$1 } /.*/ { - if ( noslash = "yes" && dep ~ /^\// ) next - if (filenm != prev) { - if (rec != "") - print rec; - rec = filenm " " dep; - prev = filenm; - } - else { - if (length(rec dep) > 78) { - print rec; - rec = filenm " " dep; - } - else - rec = rec " " dep - } + if (( noslash == "yes") && (dep ~ /^\// )) next + if ( length(dep) < 2 ) next + rec = filenm " " dep; + print rec; } -END { - print rec -}' noslash="$NOSLASH" >> $TMP +' noslash="$NOSLASH" >> $TMP + cat << _EOF_ >> $TMP diff --git a/build/top.mk b/build/top.mk index 96034a501c..5bfb0e2cf2 100644 --- a/build/top.mk +++ b/build/top.mk @@ -49,11 +49,11 @@ AR = ar LINT = lint 5LINT = 5lint -MKDEP = $(top_srcdir)/build/mkdep $(MKDEPFLAG) -c "$(CC)" +MKDEP = $(top_srcdir)/build/mkdep $(MKDEPFLAG) -d "$(srcdir)" -c "$(CC)" LIBTOOL = @LIBTOOL@ LIBVERSION = 0:0:0 -LTLINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS) $(LTVERSION) +LTLINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LTVERSION) LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) # Misc UNIX commands used in makefiles @@ -85,32 +85,46 @@ LDAP_INCPATH= -I$(LDAP_INCDIR) -I$(INCLUDEDIR) LDAP_LIBADIR= $(top_builddir)/libraries LDAP_LIBPATH= -L$(LDAP_LIBADIR) -LDAP_LIBLBER = $(LDAP_LIBADIR)/liblber/liblber.la -LDAP_LIBLDAP = $(LDAP_LIBADIR)/libldap/libldap.la +LDAP_LIBLBER = -llber +LDAP_LIBLDAP = -lldap +LDAP_LIBLDIF = -lldif +LDAP_LIBLUTIL = -llutil @LUTIL_LIBS@ +LDAP_LIBLDBM = -lldbm @LDBM_LIBS@ +LDAP_LIBLTHREAD = -llthread @LTHREAD_LIBS@ LDAP_LIBLBER_DEPEND = $(LDAP_LIBDIR)/liblber/liblber.la LDAP_LIBLDAP_DEPEND = $(LDAP_LIBDIR)/libldap/libldap.la +LDAP_LIBLDIF_DEPEND = $(LDAP_LIBDIR)/libldif/libldif.a +LDAP_LIBLUTIL_DEPEND = $(LDAP_LIBDIR)/liblutil/liblutil.a +LDAP_LIBLDBM_DEPEND = $(LDAP_LIBDIR)/libldbm/libldbm.a +LDAP_LIBLTHREAD_DEPEND = $(LDAP_LIBDIR)/liblthread/liblthread.a -LDAP_LIBS = $(LDAP_LIBPATH) -lldif $(LDAP_LIBLDAP) $(LDAP_LIBLBER) -LDAP_LIBDEPEND = $(LDAP_LIBDIR)/libldif.a $(LDAP_LIBLDAP) $(LDAP_LIBLBER) +LDAP_LIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER) \ + $(LDAP_LIBLDIF) $(LDAP_LIBLUTIL) + +LDAP_LIBDEPEND = $(LDAP_LIBLDAP_DEPEND) $(LDAP_LIBLBER_DEPEND) \ + $(LDAP_LIBLDIF_DEPEND) $(LDAP_LIBLUTIL_DEPEND) # AutoConfig generated AC_CC = @CC@ -AC_DEFS = @CPPFLAGS@ @DEFS@ -AC_LIBS = @LDFLAGS@ @LIBS@ AC_CFLAGS = @CFLAGS@ -AC_LDFLAGS = +AC_DEFS = @CPPFLAGS@ @DEFS@ +AC_LDFLAGS = @LDFLAGS@ +AC_LIBS = @LIBS@ KRB_LIBS = @KRB_LIBS@ TERMCAP_LIBS = @TERMCAP_LIBS@ +LDAPD_LIBS = @LDAPD_LIBS@ +SLAPD_LIBS = @SLAPD_LIBS@ +SLURPD_LIBS = @SLURPD_LIBS@ + # Our Defaults CC = $(AC_CC) -DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) -LIBS = $(LDAP_LIBS) $(XLIBS) $(AC_LIBS) - -CFLAGS = $(AC_CFLAGS) $(DEFS) $(DEFINES) -LDFLAGS = $(AC_LDFLAGS) +DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) $(DEFINES) +LIBS = $(XLIBS) $(AC_LIBS) $(XXLIBS) +CFLAGS = $(AC_CFLAGS) $(DEFS) +LDFLAGS = $(AC_LDFLAGS) $(XLDFLAGS) all: all-common all-local FORCE install: install-common install-local FORCE diff --git a/clients/fax500/Makefile.in b/clients/fax500/Makefile.in index eee5f6b526..ba3d600a71 100644 --- a/clients/fax500/Makefile.in +++ b/clients/fax500/Makefile.in @@ -9,6 +9,9 @@ RPOBJS = rp500.o faxtotpc.o LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries +XLIBS = $(LDAP_LIBS) +XXLIBS = $(KRB_LIBS) + rp500 : rpversion.o $(LTLINK) -o $@ $(RPOBJS) rpversion.o $(LIBS) diff --git a/clients/finger/Makefile.in b/clients/finger/Makefile.in index 32429851dc..78c6e16535 100644 --- a/clients/finger/Makefile.in +++ b/clients/finger/Makefile.in @@ -6,6 +6,9 @@ PROGRAMS= in.xfingerd LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries +XLIBS = $(LDAP_LIBS) +XXLIBS = $(KRB_LIBS) + in.xfingerd : version.o $(LTLINK) -o $@ version.o $(OBJS) $(LIBS) diff --git a/clients/gopher/Makefile.in b/clients/gopher/Makefile.in index 7d487761b2..f663f0328b 100644 --- a/clients/gopher/Makefile.in +++ b/clients/gopher/Makefile.in @@ -11,7 +11,8 @@ GWOBJS = go500gw.o LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XLIBS = -llutil @LUTIL_LIBS@ +XLIBS = $(LDAP_LIBS) +XXLIBS = $(KRB_LIBS) go500 : goversion.o $(LTLINK) -o $@ $(GOOBJS) goversion.o $(LIBS) @@ -40,4 +41,4 @@ install-local: $(PROGRAMS) go500gw.help FORCE $(LTINSTALL) $(INSTALLFLAGS) -m 755 go500 $(libexecdir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 go500gw $(libexecdir) -$(MV) $(datadir)/go500gw.help $(datadir)/go500gw.help- - $(INSTALL) $(INSTALLFLAGS) -m 644 go500gw.help $(datadir) + $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/go500gw.help $(datadir) diff --git a/clients/mail500/Makefile.in b/clients/mail500/Makefile.in index 0c5c2f4c27..da058124bd 100644 --- a/clients/mail500/Makefile.in +++ b/clients/mail500/Makefile.in @@ -7,6 +7,9 @@ OBJS= main.o LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries +XLIBS = $(LDAP_LIBS) +XXLIBS = $(KRB_LIBS) + mail500 : version.o $(LTLINK) -o $@ version.o $(OBJS) $(LIBS) diff --git a/clients/rcpt500/Makefile.in b/clients/rcpt500/Makefile.in index 541b8374ab..8a7edd87da 100644 --- a/clients/rcpt500/Makefile.in +++ b/clients/rcpt500/Makefile.in @@ -7,6 +7,9 @@ HDRS= rcpt500.h LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries +XLIBS = $(LDAP_LIBS) +XXLIBS = $(KRB_LIBS) + rcpt500 : version.o $(LTLINK) -o $@ version.o $(OBJS) $(LIBS) @@ -22,4 +25,4 @@ install-local: $(PROGRAMS) rcpt500.help FORCE -$(MKDIR) $(libexecdir) $(datadir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 rcpt500 $(libexecdir) -$(MV) $(datadir)/rcpt500.help $(datadir)/rcpt500.help- - $(INSTALL) $(INSTALLFLAGS) -m 644 rcpt500.help $(datadir) + $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/rcpt500.help $(datadir) diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in index 806ea35f3b..8c2624c4f0 100644 --- a/clients/tools/Makefile.in +++ b/clients/tools/Makefile.in @@ -4,11 +4,12 @@ SRCS = ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c ldappasswd.c OBJS = ldapsearch.o ldapmodify.o ldapdelete.o ldapmodrdn.o ldappasswd.o -XLIBS = $(KRB_LIBS) - LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries +XLIBS = $(LDAP_LIBS) +XXLIBS = $(KRB_LIBS) + XSRCS = ldsversion.c ldmversion.c lddversion.c ldrversion.c PROGRAMS = ldapsearch ldapmodify ldapdelete ldapmodrdn ldapadd ldappasswd @@ -26,7 +27,7 @@ ldapmodrdn: ldrversion.o $(LTLINK) -o $@ ldapmodrdn.o ldrversion.o $(LIBS) ldappasswd: ldappasswd.o - $(LTLINK) -o $@ ldappasswd.o $(LIBS) @LUTIL_LIBS@ $(LDAP_LIBPATH) -llutil + $(LTLINK) -o $@ ldappasswd.o $(LUTIL_LIBS) $(LIBS) ldapadd: ldapmodify $(RM) $@ diff --git a/clients/ud/Makefile.in b/clients/ud/Makefile.in index f1ec3b01b9..3e2fdcb233 100644 --- a/clients/ud/Makefile.in +++ b/clients/ud/Makefile.in @@ -9,7 +9,8 @@ PROGRAMS= ud LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XLIBS = $(TERMCAP_LIBS) $(KRB_LIBS) +XLIBS = $(LDAP_LIBS) +XXLIBS = $(TERMCAP_LIBS) $(KRB_LIBS) ud : version.o $(LTLINK) -o $@ version.o $(OBJS) $(LIBS) diff --git a/configure b/configure index fc2d42b72c..96fbeaf6f6 100755 --- a/configure +++ b/configure @@ -3526,9 +3526,9 @@ echo "$ac_t""$ol_cv_thread_flag" 1>&6 if test $ol_link_threads = no ; then save_LIBS="$LIBS" - echo $ac_n "checking for pthread_join in -lpthread""... $ac_c" 1>&6 -echo "configure:3531: checking for pthread_join in -lpthread" >&5 -ac_lib_var=`echo pthread'_'pthread_join | sed 'y%./+-%__p_%'` + echo $ac_n "checking for pthread_mutex_lock in -lpthread""... $ac_c" 1>&6 +echo "configure:3531: checking for pthread_mutex_lock in -lpthread" >&5 +ac_lib_var=`echo pthread'_'pthread_mutex_lock | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3540,10 +3540,10 @@ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then @@ -3577,9 +3577,9 @@ fi if test $ol_link_threads = no ; then save_LIBS="$LIBS" - echo $ac_n "checking for pthread_join in -lpthreads""... $ac_c" 1>&6 -echo "configure:3582: checking for pthread_join in -lpthreads" >&5 -ac_lib_var=`echo pthreads'_'pthread_join | sed 'y%./+-%__p_%'` + echo $ac_n "checking for pthread_mutex_unlock in -lpthreads""... $ac_c" 1>&6 +echo "configure:3582: checking for pthread_mutex_unlock in -lpthreads" >&5 +ac_lib_var=`echo pthreads'_'pthread_mutex_unlock | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3591,10 +3591,10 @@ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then @@ -3764,6 +3764,55 @@ else echo "$ac_t""no" 1>&6 fi + LIBS="$save_LIBS" + fi + + if test $ol_link_threads = no ; then + save_LIBS="$LIBS" + echo $ac_n "checking for pthread_join in -lpthreads""... $ac_c" 1>&6 +echo "configure:3774: checking for pthread_join in -lpthreads" >&5 +ac_lib_var=`echo pthreads'_'pthread_join | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lpthreads $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + ol_link_threads=posix + LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads" + +else + echo "$ac_t""no" 1>&6 +-Wl,-woff,85 +fi + LIBS="$save_LIBS" fi @@ -3771,14 +3820,14 @@ fi save_LIBS="$LIBS" LIBS="$LIBS -lpthread" echo $ac_n "checking for pthread_create() in HP-UX -lpthread""... $ac_c" 1>&6 -echo "configure:3775: checking for pthread_create() in HP-UX -lpthread" >&5 +echo "configure:3824: checking for pthread_create() in HP-UX -lpthread" >&5 ol_try_pthread_hpux_11=no if eval "test \"`echo '$''{'ol_cv_pthread_hpux_11'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3791,7 +3840,7 @@ int main() { pthread_create(NULL, NULL, NULL, NULL); ; return 0; } EOF -if { (eval echo configure:3795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ol_try_pthread_hpux_11=yes ol_cv_pthread_hpux_11=yes @@ -3829,12 +3878,12 @@ EOF for ac_func in sched_yield pthread_yield do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3833: checking for $ac_func" >&5 +echo "configure:3882: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3885,7 +3934,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:3889: checking for sched_yield in -lrt" >&5 +echo "configure:3938: checking for sched_yield in -lrt" >&5 ac_lib_var=`echo rt'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3893,7 +3942,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3934,7 +3983,7 @@ fi if test $ac_cv_func_sched_yield = no -a \ $ac_cv_func_pthread_yield = no ; then echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 -echo "configure:3938: checking for sched_yield in -lposix4" >&5 +echo "configure:3987: checking for sched_yield in -lposix4" >&5 ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3942,7 +3991,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3989,12 +4038,12 @@ fi for ac_func in pthread_kill do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3993: checking for $ac_func" >&5 +echo "configure:4042: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4048,12 +4097,12 @@ done do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4052: checking for $ac_func" >&5 +echo "configure:4101: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4107,12 +4156,12 @@ done do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4111: checking for $ac_func" >&5 +echo "configure:4160: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4161,7 +4210,7 @@ done echo $ac_n "checking if pthread_create() works""... $ac_c" 1>&6 -echo "configure:4165: checking if pthread_create() works" >&5 +echo "configure:4214: checking if pthread_create() works" >&5 if eval "test \"`echo '$''{'ol_cv_pthread_create_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4170,7 +4219,7 @@ else ol_cv_pthread_create_works=yes else cat > conftest.$ac_ext < @@ -4193,7 +4242,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:4197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ol_cv_pthread_create_works=yes else @@ -4215,7 +4264,7 @@ fi if test $ol_with_yielding_select = auto ; then echo $ac_n "checking if select yields when using pthreads""... $ac_c" 1>&6 -echo "configure:4219: checking if select yields when using pthreads" >&5 +echo "configure:4268: checking if select yields when using pthreads" >&5 if eval "test \"`echo '$''{'ol_cv_pthread_select_yields'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4225,7 +4274,7 @@ else { echo "configure: error: crossing compiling: use --with-yielding_select=yes|no|manual" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4297,7 +4346,7 @@ int main(argc, argv) exit(2); } EOF -if { (eval echo configure:4301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ol_cv_pthread_select_yields=no else @@ -4337,17 +4386,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:4341: checking for $ac_hdr" >&5 +echo "configure:4390: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4377,12 +4426,12 @@ done ol_with_threads=found echo $ac_n "checking for cthread_fork""... $ac_c" 1>&6 -echo "configure:4381: checking for cthread_fork" >&5 +echo "configure:4430: checking for cthread_fork" >&5 if eval "test \"`echo '$''{'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; then +if { (eval echo configure:4458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_cthread_fork=yes" else @@ -4427,7 +4476,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:4431: checking for cthread_fork with -all_load" >&5 +echo "configure:4480: checking for cthread_fork with -all_load" >&5 if eval "test \"`echo '$''{'ol_cv_cthread_all_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4435,7 +4484,7 @@ else save_LIBS="$LIBS" LIBS="-all_load $LIBS" cat > conftest.$ac_ext < int main() { @@ -4444,7 +4493,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ol_cv_cthread_all_load=yes else @@ -4489,17 +4538,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:4493: checking for $ac_hdr" >&5 +echo "configure:4542: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4527,7 +4576,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:4531: checking for thr_create in -lthread" >&5 +echo "configure:4580: checking for thr_create in -lthread" >&5 ac_lib_var=`echo thread'_'thr_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4535,7 +4584,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4586,17 +4635,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4590: checking for $ac_hdr" >&5 +echo "configure:4639: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4624,7 +4673,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:4628: checking for lwp_create in -llwp" >&5 +echo "configure:4677: checking for lwp_create in -llwp" >&5 ac_lib_var=`echo lwp'_'lwp_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4632,7 +4681,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llwp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4696,17 +4745,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:4700: checking for $ac_hdr" >&5 +echo "configure:4749: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4735,12 +4784,12 @@ done for ac_func in sched_yield pthread_yield do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4739: checking for $ac_func" >&5 +echo "configure:4788: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4789,7 +4838,7 @@ done echo $ac_n "checking for LinuxThreads""... $ac_c" 1>&6 -echo "configure:4793: checking for LinuxThreads" >&5 +echo "configure:4842: checking for LinuxThreads" >&5 if eval "test \"`echo '$''{'ol_cv_linux_threads'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4810,17 +4859,17 @@ echo "$ac_t""$ol_cv_linux_threads" 1>&6 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4814: checking for $ac_hdr" >&5 +echo "configure:4863: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4850,17 +4899,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4854: checking for $ac_hdr" >&5 +echo "configure:4903: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4890,17 +4939,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4894: checking for $ac_hdr" >&5 +echo "configure:4943: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4955,13 +5004,13 @@ EOF echo $ac_n "checking for thread specific errno""... $ac_c" 1>&6 -echo "configure:4959: checking for thread specific errno" >&5 +echo "configure:5008: checking for thread specific errno" >&5 if eval "test \"`echo '$''{'ol_cv_errno_thread_specific'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4972,7 +5021,7 @@ int x = errno; ; return 0; } EOF -if { (eval echo configure:4976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ol_cv_errno_thread_specific=yes else @@ -5015,13 +5064,13 @@ fi ol_link_ldbm=no if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db2 ; then echo $ac_n "checking for DB2 library""... $ac_c" 1>&6 -echo "configure:5019: checking for DB2 library" >&5 +echo "configure:5068: checking for DB2 library" >&5 if eval "test \"`echo '$''{'ol_cv_lib_db2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ol_LIBS="$LIBS" echo $ac_n "checking for db_open in -ldb""... $ac_c" 1>&6 -echo "configure:5025: checking for db_open in -ldb" >&5 +echo "configure:5074: checking for db_open in -ldb" >&5 ac_lib_var=`echo db'_'db_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5029,7 +5078,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5071,17 +5120,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:5075: checking for $ac_hdr" >&5 +echo "configure:5124: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5109,13 +5158,13 @@ done if test $ac_cv_header_db_h = yes ; then echo $ac_n "checking if db.h is DB2""... $ac_c" 1>&6 -echo "configure:5113: checking if db.h is DB2" >&5 +echo "configure:5162: checking if db.h is DB2" >&5 if eval "test \"`echo '$''{'ol_cv_header_db2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5147,7 +5196,7 @@ fi echo $ac_n "checking for Berkeley DB2""... $ac_c" 1>&6 -echo "configure:5151: checking for Berkeley DB2" >&5 +echo "configure:5200: checking for Berkeley DB2" >&5 if eval "test \"`echo '$''{'ol_cv_berkeley_db2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5193,18 +5242,18 @@ fi if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db ; then echo $ac_n "checking for Berkeley DB library""... $ac_c" 1>&6 -echo "configure:5197: checking for Berkeley DB library" >&5 +echo "configure:5246: checking for Berkeley DB library" >&5 if eval "test \"`echo '$''{'ol_cv_lib_db'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ol_LIBS="$LIBS" echo $ac_n "checking for dbopen""... $ac_c" 1>&6 -echo "configure:5203: checking for dbopen" >&5 +echo "configure:5252: checking for dbopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dbopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbopen=yes" else @@ -5246,7 +5295,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 -echo "configure:5250: checking for dbopen in -ldb" >&5 +echo "configure:5299: checking for dbopen in -ldb" >&5 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5254,7 +5303,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5300,17 +5349,17 @@ for ac_hdr in db_185.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5304: checking for $ac_hdr" >&5 +echo "configure:5353: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5346,7 +5395,7 @@ fi echo $ac_n "checking for Berkeley DB""... $ac_c" 1>&6 -echo "configure:5350: checking for Berkeley DB" >&5 +echo "configure:5399: checking for Berkeley DB" >&5 if eval "test \"`echo '$''{'ol_cv_berkeley_db'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5399,17 +5448,17 @@ if test $ol_with_ldbm_api = manual ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5403: checking for $ac_hdr" >&5 +echo "configure:5452: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5444,18 +5493,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:5448: checking for GDBM library" >&5 +echo "configure:5497: checking for GDBM library" >&5 if eval "test \"`echo '$''{'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:5454: checking for gdbm_open" >&5 +echo "configure:5503: checking for gdbm_open" >&5 if eval "test \"`echo '$''{'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; then +if { (eval echo configure:5531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gdbm_open=yes" else @@ -5497,7 +5546,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:5501: checking for gdbm_open in -lgdbm" >&5 +echo "configure:5550: checking for gdbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5505,7 +5554,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5551,17 +5600,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:5555: checking for $ac_hdr" >&5 +echo "configure:5604: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5588,7 +5637,7 @@ fi done echo $ac_n "checking for db""... $ac_c" 1>&6 -echo "configure:5592: checking for db" >&5 +echo "configure:5641: checking for db" >&5 if eval "test \"`echo '$''{'ol_cv_gdbm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5624,18 +5673,18 @@ if test $ol_with_ldbm_api = auto ; then echo "configure: warning: skipping automatic checking for NDBM, must be manually enabled." 1>&2 elif test $ol_with_ldbm_api = ndbm ; then echo $ac_n "checking for NDBM library""... $ac_c" 1>&6 -echo "configure:5628: checking for NDBM library" >&5 +echo "configure:5677: checking for NDBM library" >&5 if eval "test \"`echo '$''{'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:5634: checking for dbm_open" >&5 +echo "configure:5683: checking for dbm_open" >&5 if eval "test \"`echo '$''{'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; then +if { (eval echo configure:5711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -5677,7 +5726,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6 -echo "configure:5681: checking for dbm_open in -lndbm" >&5 +echo "configure:5730: checking for dbm_open in -lndbm" >&5 ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5685,7 +5734,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lndbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5716,7 +5765,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:5720: checking for dbm_open in -ldbm" >&5 +echo "configure:5769: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5724,7 +5773,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5772,17 +5821,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:5776: checking for $ac_hdr" >&5 +echo "configure:5825: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5835: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5809,7 +5858,7 @@ fi done echo $ac_n "checking for db""... $ac_c" 1>&6 -echo "configure:5813: checking for db" >&5 +echo "configure:5862: checking for db" >&5 if eval "test \"`echo '$''{'ol_cv_ndbm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5853,7 +5902,7 @@ fi if test $ol_enable_wrappers != no ; then echo $ac_n "checking for main in -lwrap""... $ac_c" 1>&6 -echo "configure:5857: checking for main in -lwrap" >&5 +echo "configure:5906: checking for main in -lwrap" >&5 ac_lib_var=`echo wrap'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5861,14 +5910,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lwrap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5910,12 +5959,12 @@ fi if test $ol_enable_syslog != no ; then echo $ac_n "checking for openlog""... $ac_c" 1>&6 -echo "configure:5914: checking for openlog" >&5 +echo "configure:5963: checking for openlog" >&5 if eval "test \"`echo '$''{'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; then +if { (eval echo configure:5991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_openlog=yes" else @@ -5968,17 +6017,17 @@ if test $ol_enable_dmalloc != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5972: checking for $ac_hdr" >&5 +echo "configure:6021: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6005,7 +6054,7 @@ fi done echo $ac_n "checking for dmalloc_shutdown in -ldmalloc""... $ac_c" 1>&6 -echo "configure:6009: checking for dmalloc_shutdown in -ldmalloc" >&5 +echo "configure:6058: checking for dmalloc_shutdown in -ldmalloc" >&5 ac_lib_var=`echo dmalloc'_'dmalloc_shutdown | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6013,7 +6062,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6059,17 +6108,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:6063: checking for $ac_hdr" >&5 +echo "configure:6112: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6098,7 +6147,7 @@ done if test $ol_link_termcap = no ; then echo $ac_n "checking for tputs in -ltermcap""... $ac_c" 1>&6 -echo "configure:6102: checking for tputs in -ltermcap" >&5 +echo "configure:6151: checking for tputs in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tputs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6106,7 +6155,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6150,7 +6199,7 @@ fi if test $ol_link_termcap = no ; then echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:6154: checking for initscr in -lncurses" >&5 +echo "configure:6203: checking for initscr in -lncurses" >&5 ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6158,7 +6207,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6211,12 +6260,12 @@ fi # FreeBSD (and others) have crypt(3) in -lcrypt if test $ol_enable_crypt != no ; then echo $ac_n "checking for crypt""... $ac_c" 1>&6 -echo "configure:6215: checking for crypt" >&5 +echo "configure:6264: checking for crypt" >&5 if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_crypt=yes" else @@ -6258,7 +6307,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:6262: checking for crypt in -lcrypt" >&5 +echo "configure:6311: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6266,7 +6315,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6321,12 +6370,12 @@ fi # FreeBSD (and others) have setproctitle(3) in -lutil if test $ol_enable_proctitle != no ; then echo $ac_n "checking for setproctitle""... $ac_c" 1>&6 -echo "configure:6325: checking for setproctitle" >&5 +echo "configure:6374: checking for setproctitle" >&5 if eval "test \"`echo '$''{'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; then +if { (eval echo configure:6402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_setproctitle=yes" else @@ -6368,7 +6417,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6 -echo "configure:6372: checking for setproctitle in -lutil" >&5 +echo "configure:6421: checking for setproctitle in -lutil" >&5 ac_lib_var=`echo util'_'setproctitle | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6376,7 +6425,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6422,12 +6471,12 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:6426: checking for ANSI C header files" >&5 +echo "configure:6475: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6435,7 +6484,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6452,7 +6501,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 @@ -6470,7 +6519,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 @@ -6491,7 +6540,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -6502,7 +6551,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:6506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -6535,12 +6584,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:6539: checking for $ac_hdr that defines DIR" >&5 +echo "configure:6588: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -6548,7 +6597,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:6552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -6573,7 +6622,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:6577: checking for opendir in -ldir" >&5 +echo "configure:6626: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6581,7 +6630,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6614,7 +6663,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:6618: checking for opendir in -lx" >&5 +echo "configure:6667: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6622,7 +6671,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6656,12 +6705,12 @@ fi fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:6660: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:6709: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6677,7 +6726,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:6681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -6698,12 +6747,12 @@ EOF fi echo $ac_n "checking POSIX termios""... $ac_c" 1>&6 -echo "configure:6702: checking POSIX termios" >&5 +echo "configure:6751: checking POSIX termios" >&5 if eval "test \"`echo '$''{'am_cv_sys_posix_termios'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6713,7 +6762,7 @@ int main() { tcgetattr(0, 0); ; return 0; } EOF -if { (eval echo configure:6717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* am_cv_sys_posix_termios=yes else @@ -6729,7 +6778,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:6733: checking whether use of TIOCGWINSZ requires sys/ioctl.h" >&5 +echo "configure:6782: checking whether use of TIOCGWINSZ requires sys/ioctl.h" >&5 if eval "test \"`echo '$''{'am_cv_sys_tiocgwinsz_needs_sys_ioctl_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6738,7 +6787,7 @@ else gwinsz_in_termios_h=no if test $am_cv_sys_posix_termios = yes; then cat > conftest.$ac_ext < # include @@ -6758,7 +6807,7 @@ rm -f conftest* if test $gwinsz_in_termios_h = no; then cat > conftest.$ac_ext < # include @@ -6828,17 +6877,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:6832: checking for $ac_hdr" >&5 +echo "configure:6881: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6866,12 +6915,12 @@ done echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:6870: checking for uid_t in sys/types.h" >&5 +echo "configure:6919: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -6900,7 +6949,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:6904: checking type of array argument to getgroups" >&5 +echo "configure:6953: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6908,7 +6957,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -6947,7 +6996,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -6970,12 +7019,12 @@ cat >> confdefs.h <&6 -echo "configure:6974: checking for mode_t" >&5 +echo "configure:7023: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -7003,12 +7052,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:7007: checking for off_t" >&5 +echo "configure:7056: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -7036,12 +7085,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:7040: checking for pid_t" >&5 +echo "configure:7089: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -7069,19 +7118,19 @@ EOF fi echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6 -echo "configure:7073: checking for ptrdiff_t" >&5 +echo "configure:7122: checking for ptrdiff_t" >&5 if eval "test \"`echo '$''{'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:7085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_type_ptrdiff_t=yes else @@ -7102,12 +7151,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:7106: checking return type of signal handlers" >&5 +echo "configure:7155: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7124,7 +7173,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:7128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -7143,19 +7192,19 @@ EOF echo $ac_n "checking for sig_atomic_t""... $ac_c" 1>&6 -echo "configure:7147: checking for sig_atomic_t" >&5 +echo "configure:7196: checking for sig_atomic_t" >&5 if eval "test \"`echo '$''{'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:7159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_type_sig_atomic_t=yes else @@ -7176,12 +7225,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:7180: checking for size_t" >&5 +echo "configure:7229: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -7209,12 +7258,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:7213: checking for st_blksize in struct stat" >&5 +echo "configure:7262: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7222,7 +7271,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:7226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -7243,12 +7292,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:7247: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:7296: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7257,7 +7306,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:7261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -7278,12 +7327,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:7282: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:7331: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7291,7 +7340,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:7295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -7314,7 +7363,7 @@ fi echo $ac_n "checking if toupper() requires islower()""... $ac_c" 1>&6 -echo "configure:7318: checking if toupper() requires islower()" >&5 +echo "configure:7367: checking if toupper() requires islower()" >&5 if eval "test \"`echo '$''{'ol_cv_c_upper_lower'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7323,7 +7372,7 @@ else ol_cv_c_upper_lower=safe else cat > conftest.$ac_ext < @@ -7335,7 +7384,7 @@ main() exit(1); } EOF -if { (eval echo configure:7339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ol_cv_c_upper_lower=no else @@ -7358,12 +7407,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:7362: checking for working const" >&5 +echo "configure:7411: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -7433,12 +7482,12 @@ EOF fi echo $ac_n "checking if compiler understands volatile""... $ac_c" 1>&6 -echo "configure:7437: checking if compiler understands volatile" >&5 +echo "configure:7486: checking if compiler understands volatile" >&5 if eval "test \"`echo '$''{'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:7500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_c_volatile=yes else @@ -7477,14 +7526,14 @@ EOF else echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:7481: checking whether byte ordering is bigendian" >&5 +echo "configure:7530: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'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 @@ -7495,11 +7544,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:7499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7548: \"$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 @@ -7510,7 +7559,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:7514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -7530,7 +7579,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 && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -7567,7 +7616,7 @@ EOF fi echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:7571: checking size of short" >&5 +echo "configure:7620: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7575,7 +7624,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -7586,7 +7635,7 @@ main() exit(0); } EOF -if { (eval echo configure:7590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -7606,7 +7655,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:7610: checking size of int" >&5 +echo "configure:7659: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7614,7 +7663,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -7625,7 +7674,7 @@ main() exit(0); } EOF -if { (eval echo configure:7629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -7645,7 +7694,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:7649: checking size of long" >&5 +echo "configure:7698: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7653,7 +7702,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -7664,7 +7713,7 @@ main() exit(0); } EOF -if { (eval echo configure:7668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -7686,7 +7735,7 @@ EOF fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:7690: checking for 8-bit clean memcmp" >&5 +echo "configure:7739: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7694,7 +7743,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -7722,12 +7771,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o" echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:7726: checking for strftime" >&5 +echo "configure:7775: checking for strftime" >&5 if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -7772,7 +7821,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:7776: checking for strftime in -lintl" >&5 +echo "configure:7825: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7780,7 +7829,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7818,12 +7867,12 @@ fi fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:7822: checking for vprintf" >&5 +echo "configure:7871: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -7870,12 +7919,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:7874: checking for _doprnt" >&5 +echo "configure:7923: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -7927,12 +7976,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:7931: checking for $ac_func" >&5 +echo "configure:7980: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7982,7 +8031,7 @@ done fi echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6 -echo "configure:7986: checking for wait3 that fills in rusage" >&5 +echo "configure:8035: checking for wait3 that fills in rusage" >&5 if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7990,7 +8039,7 @@ else ac_cv_func_wait3_rusage=no else cat > conftest.$ac_ext < #include @@ -8021,7 +8070,7 @@ main() { } } EOF -if { (eval echo configure:8025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_wait3_rusage=yes else @@ -8076,12 +8125,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8080: checking for $ac_func" >&5 +echo "configure:8129: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8138,12 +8187,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8142: checking for $ac_func" >&5 +echo "configure:8191: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8192,19 +8241,19 @@ done echo $ac_n "checking number of arguments of ctime_r""... $ac_c" 1>&6 -echo "configure:8196: checking number of arguments of ctime_r" >&5 +echo "configure:8245: checking number of arguments of ctime_r" >&5 if eval "test \"`echo '$''{'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:8208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_ctime_r_nargs=3 else @@ -8216,7 +8265,7 @@ fi rm -f conftest* if test $ol_cv_func_ctime_r_nargs = 0 ; then cat > conftest.$ac_ext < int main() { @@ -8224,7 +8273,7 @@ time_t ti; char *buffer; ctime_r(&ti,buffer); ; return 0; } EOF -if { (eval echo configure:8228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_ctime_r_nargs=2 else @@ -8270,12 +8319,12 @@ fi for ac_func in getopt strdup tempnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8274: checking for $ac_func" >&5 +echo "configure:8323: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8328,13 +8377,13 @@ done # Check Configuration echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6 -echo "configure:8332: checking declaration of sys_errlist" >&5 +echo "configure:8381: checking declaration of sys_errlist" >&5 if eval "test \"`echo '$''{'ol_cv_dcl_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -8344,7 +8393,7 @@ int main() { char *c = (char *) *sys_errlist ; return 0; } EOF -if { (eval echo configure:8348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_dcl_sys_errlist=yes else @@ -8365,20 +8414,20 @@ if test $ol_cv_dcl_sys_errlist = no ; then EOF echo $ac_n "checking existence of sys_errlist""... $ac_c" 1>&6 -echo "configure:8369: checking existence of sys_errlist" >&5 +echo "configure:8418: checking existence of sys_errlist" >&5 if eval "test \"`echo '$''{'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:8382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ol_cv_have_sys_errlist=yes else @@ -8517,6 +8566,8 @@ fi + + @@ -8665,6 +8716,7 @@ servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \ servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/srv.mk \ servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/srv.mk \ servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/srv.mk \ +servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/srv.mk \ servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk \ servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \ servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \ @@ -8734,10 +8786,13 @@ s%@BUILD_SLAPD@%$BUILD_SLAPD%g s%@BUILD_LDBM@%$BUILD_LDBM%g s%@BUILD_PASSWD@%$BUILD_PASSWD%g s%@BUILD_SHELL@%$BUILD_SHELL%g +s%@BUILD_PERL@%$BUILD_PERL%g s%@BUILD_SLURPD@%$BUILD_SLURPD%g s%@LDAP_LIBS@%$LDAP_LIBS%g s%@LDAPD_LIBS@%$LDAPD_LIBS%g s%@SLAPD_LIBS@%$SLAPD_LIBS%g +s%@SLAPD_PERL_LDFLAGS@%$SLAPD_PERL_LDFLAGS%g +s%@SLAPD_PERL_CPPFLAGS@%$SLAPD_PERL_CPPFLAGS%g s%@SLURPD_LIBS@%$SLURPD_LIBS%g s%@LDBM_LIBS@%$LDBM_LIBS%g s%@LTHREAD_LIBS@%$LTHREAD_LIBS%g @@ -8817,6 +8872,7 @@ servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \ servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/srv.mk \ servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/srv.mk \ servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/srv.mk \ +servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/srv.mk \ servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk \ servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \ servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \ diff --git a/configure.in b/configure.in index febf88fe2f..4309e0be5d 100644 --- a/configure.in +++ b/configure.in @@ -273,7 +273,8 @@ dnl AC_CHECK_LIB(gen, main) ]) -dnl Check for resolv +dnl Check for resolver routines +AC_CHECK_LIB(bind, res_search) AC_CHECK_LIB(resolv, res_search) dnl HP-UX requires -lV3 @@ -448,7 +449,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ if test $ol_link_threads = no ; then dnl try DEC Threads -lpthread -lexc save_LIBS="$LIBS" - AC_CHECK_LIB(pthread, pthread_join, [ + AC_CHECK_LIB(pthread, pthread_mutex_lock, [ ol_link_threads=posix LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lexc" if test $ol_with_yielding_select = auto ; then @@ -461,7 +462,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ if test $ol_link_threads = no ; then dnl try DEC Threads -lpthreads -lmach -lexc -lc_r save_LIBS="$LIBS" - AC_CHECK_LIB(pthreads, pthread_join, [ + AC_CHECK_LIB(pthreads, pthread_mutex_unlock, [ ol_link_threads=posix LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lmach -lexc -lc_r" if test $ol_with_yielding_select = auto ; then @@ -498,7 +499,18 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ LIBS="$save_LIBS" fi - dnl HP-UX 11 check + dnl IRIX Pthread check + if test $ol_link_threads = no ; then + dnl try IRIX Pthreads -Wl,-woff,85 -lpthreads + save_LIBS="$LIBS" + AC_CHECK_LIB(pthreads, pthread_join, [ + ol_link_threads=posix + LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads" + ],[-Wl,-woff,85]) + LIBS="$save_LIBS" + fi + + dnl HP-UX 11 Pthread check if test $ol_link_threads = no; then save_LIBS="$LIBS" LIBS="$LIBS -lpthread" @@ -1326,7 +1338,6 @@ AC_SUBST(BUILD_SLAPD) AC_SUBST(BUILD_SHELL) AC_SUBST(BUILD_SLURPD) - AC_SUBST(LDAP_LIBS) AC_SUBST(LDAPD_LIBS) AC_SUBST(SLAPD_LIBS) diff --git a/include/Makefile.in b/include/Makefile.in index f44961b51e..5989104356 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -7,12 +7,12 @@ all-local: ldapconfig.h FORCE install-local: FORCE -$(MKDIR) -p $(includedir) - $(INSTALL) $(INSTALLFLAGS) -m 644 ldap.h $(includedir) - $(INSTALL) $(INSTALLFLAGS) -m 644 lber.h $(includedir) - $(INSTALL) $(INSTALLFLAGS) -m 644 ldap_cdefs.h $(includedir) + $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldap.h $(includedir) + $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/lber.h $(includedir) + $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldap_cdefs.h $(includedir) + $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/disptmpl.h $(includedir) + $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/srchpref.h $(includedir) $(INSTALL) $(INSTALLFLAGS) -m 644 ldap_features.h $(includedir) - $(INSTALL) $(INSTALLFLAGS) -m 644 disptmpl.h $(includedir) - $(INSTALL) $(INSTALLFLAGS) -m 644 srchpref.h $(includedir) clean-local: FORCE $(RM) ldapconfig.h diff --git a/include/portable.h.in b/include/portable.h.in index b35f13612b..1497701a23 100644 --- a/include/portable.h.in +++ b/include/portable.h.in @@ -92,14 +92,26 @@ #undef WORDS_BIGENDIAN /* define this if needed to get reentrant functions */ +#ifndef REENTRANT #undef REENTRANT +#endif +#ifndef _REENTRANT #undef _REENTRANT +#endif /* define this if needed to get threadsafe functions */ +#ifndef THREADSAFE #undef THREADSAFE +#endif +#ifndef _THREADSAFE #undef _THREADSAFE +#endif +#ifndef THREAD_SAFE #undef THREAD_SAFE +#endif +#ifndef _THREAD_SAFE #undef _THREAD_SAFE +#endif /* define this if cross compiling */ #undef CROSS_COMPILING diff --git a/libraries/libavl/Makefile.in b/libraries/libavl/Makefile.in index 814d5e1cf0..f6cd83d530 100644 --- a/libraries/libavl/Makefile.in +++ b/libraries/libavl/Makefile.in @@ -13,4 +13,4 @@ LIBRARY = libavl.a PROGRAMS = testavl testavl: $(LIBRARY) testavl.o - $(LTLINK) $(LDFLAGS) -o $@ testavl.o $(LDAP_LIBPATH) -lavl + $(LTLINK) $(LDFLAGS) -o $@ testavl.o $(LDAP_LIBPATH) -lavl $(LIBS) diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in index acb799aa3c..7bad9f2eda 100644 --- a/libraries/liblber/Makefile.in +++ b/libraries/liblber/Makefile.in @@ -16,7 +16,7 @@ PROGRAMS= dtest etest idtest LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -LIBS = $(LDAP_LIBPATH) $(LDAP_LIBLBER) $(AC_LIBS) +XXLIBS = $(LDAP_LIBPATH) $(LDAP_LIBLBER) dtest: $(LIBRARY) dtest.o $(LTLINK) $(LDFLAGS) -o $@ dtest.o $(LIBS) diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in index 53877ad062..1747fc7cdc 100644 --- a/libraries/libldap/Makefile.in +++ b/libraries/libldap/Makefile.in @@ -28,7 +28,7 @@ OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -LIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER) $(AC_LIBS) +XXLIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER) apitest: $(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND) $(LTLINK) $(LDFLAGS) -o $@ apitest.o $(LIBS) @@ -46,14 +46,14 @@ install-local: $(CFFILES) FORCE @for i in $(CFFILES); do \ if test ! -f $(sysconfdir)/$$i; then \ echo "installing $$i in $(sysconfdir)"; \ - echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i"; \ - $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i; \ + echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(sysconfdir)/$$i"; \ + $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(sysconfdir)/$$i; \ else \ echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \ fi; \ - $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i.default; \ + $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(sysconfdir)/$$i.default; \ done -$(MKDIR) $(datadir) -$(MV) $(datadir)/ldapfriendly $(datadir)/ldapfriendly- - $(INSTALL) $(INSTALLFLAGS) -m 644 ldapfriendly $(datadir)/ldapfriendly + $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldapfriendly $(datadir)/ldapfriendly diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in index e8d5f69b0e..cb28f83d41 100644 --- a/libraries/libldap_r/Makefile.in +++ b/libraries/libldap_r/Makefile.in @@ -27,7 +27,7 @@ LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries XDEFS = -DLDAP_R_COMPILE -I$(XXDIR) -LIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER) $(AC_LIBS) +XXLIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER) .links : FORCE @for i in $(XXSRCS); do \ diff --git a/libraries/libldbm/Makefile.in b/libraries/libldbm/Makefile.in index dd1c842bba..2aa551c2bc 100644 --- a/libraries/libldbm/Makefile.in +++ b/libraries/libldbm/Makefile.in @@ -10,7 +10,7 @@ OBJS = ldbm.o LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XLIBS = @LDBM_LIBS@ -lavl +XXLIBS = $(LDBM_LIBS) -lavl testldbm: libldbm.a testldbm.o $(CC) $(LDFLAGS) -o $@ testldbm.o $(LIBS) diff --git a/libraries/liblthread/Makefile.in b/libraries/liblthread/Makefile.in index a76fb6c315..ee31b5f17c 100644 --- a/libraries/liblthread/Makefile.in +++ b/libraries/liblthread/Makefile.in @@ -10,6 +10,6 @@ OBJS = rdwr.o thread.o stack.o LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XLIBS = @LTHREAD_LIBS@ +XLIBS = $(LTHREAD_LIBS) diff --git a/servers/ldapd/Makefile.in b/servers/ldapd/Makefile.in index 23a7c1e082..f82c68b3ab 100644 --- a/servers/ldapd/Makefile.in +++ b/servers/ldapd/Makefile.in @@ -18,7 +18,7 @@ LDAP_LIBDIR= ../../libraries BUILD_OPT = "--enable-ldapd" BUILD_SRV = @BUILD_LDAPD@ -XLIBS= @LDAPD_LIBS@ $(KRB_LIBS) -llutil @LUTIL_LIBS@ +XLIBS= $(LDAPD_LIBS) $(KRB_LIBS) $(LUTIL_LIBS) ldapd: version.o $(LDLINK) -o $@ $(OBJS) version.o $(LIBS) diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index c010e5395f..9766a6d57e 100644 --- a/servers/slapd/Makefile.in +++ b/servers/slapd/Makefile.in @@ -22,6 +22,11 @@ OBJS = main.o daemon.o connection.o search.o filter.o add.o charray.o \ LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries +# $(LTHREAD_LIBS) must be last! +XLIBS = libbackends.a $(SLAPD_LIBS) $(LDAP_LIBS) \ + -lavl $(LDAP_LIBLDBM) +XXLIBS = $(KRB_LIBS) $(LDAP_LIBLTHREAD) + BUILD_OPT = "--enable-slapd" BUILD_SRV = @BUILD_SLAPD@ @@ -30,10 +35,6 @@ all-local-srv: FORCE $(MAKE) $(MFLAGS) slapd (cd tools; $(MAKE) $(MFLAGS) all) -XLIBS = @SLAPD_LIBS@ libbackends.a \ - -lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ \ - $(KRB_LIBS) -llutil @LUTIL_LIBS@ - slapd: version.o $(LTLINK) -o $@ $(OBJS) version.o $(LIBS) @@ -115,7 +116,7 @@ install-conf: FORCE @-$(MKDIR) $(sysconfdir) @for i in $(CFFILES); do \ tmpcf=/tmp/$$i.$$ ; \ - $(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' $$i > $$tmpcf ; \ + $(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' $(srcdir)/$$i > $$tmpcf ; \ if test ! -f $(sysconfdir)/$$i; then \ echo "installing $$i in $(sysconfdir)"; \ echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i"; \ diff --git a/servers/slapd/back-shell/shell.h b/servers/slapd/back-shell/shell.h index bb76f15fd9..200515e42b 100644 --- a/servers/slapd/back-shell/shell.h +++ b/servers/slapd/back-shell/shell.h @@ -20,11 +20,13 @@ struct shellinfo { }; struct backend; -struct conn; -struct op; +struct slap_conn; +struct slap_op; extern int forkandexec LDAP_P((char **args, FILE **rfp, FILE **wfp)); extern void print_suffixes LDAP_P((FILE *fp, struct backend *be)); -extern int read_and_send_results LDAP_P((struct backend *be, struct conn *conn, struct op *op, FILE *fp, char **attrs, int attrsonly)); +extern int read_and_send_results LDAP_P((struct backend *be, + struct slap_conn *conn, struct slap_op *op, + FILE *fp, char **attrs, int attrsonly)); LDAP_END_DECL diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in index 2045682f6f..f4725a0dfb 100644 --- a/servers/slapd/tools/Makefile.in +++ b/servers/slapd/tools/Makefile.in @@ -18,6 +18,9 @@ BUILD_LDBM = @BUILD_LDBM@ LDAP_INCDIR= ../../../include LDAP_LIBDIR= ../../../libraries +XLIBS = $(LDAP_LIBS) $(SLAPD_LIBS) -lavl $(LDAP_LIBLDBM) +XXLIBS = $(KRB_LIBS) $(LDAP_LIBLTHREAD) + PROGRAMS=ldif2index ldif2ldbm ldbmcat ldif2id2entry \ ldif2id2children centipede ldbmtest ldif @@ -46,9 +49,6 @@ build-ldbm: FORCE ldbm-tools: $(PROGRAMS) -XLIBS = @SLAPD_LIBS@ -lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ \ - $(KRB_LIBS) -llutil @LUTIL_LIBS@ - build-edb2ldif: FORCE @if [ "$(HAVE_ISODE)" = "yes" ]; then \ $(MAKE) $(MFLAGS) edb2ldif; \ @@ -93,14 +93,13 @@ ldbmcat: ldbmcat.o $(LTLINK) -o $@ ldbmcat.o $(LIBS) ldif: ldif.o - $(LTLINK) -o $@ ldif.o $(LIBS) $(LIBS2) + $(LTLINK) -o $@ ldif.o $(LIBS) centipede: centipede.o - $(LTLINK) -o $@ centipede.o $(LIBS) $(KRBLIBFLAG) $(KRBLIBS) + $(LTLINK) -o $@ centipede.o $(LIBS) sizecount: sizecount.o ../phonetic.o ../ch_malloc.o - $(LTLINK) -o $@ sizecount.o ../phonetic.o ../ch_malloc.o \ - $(LIBS) $(KRBLIBFLAG) $(KRBLIBS) + $(LTLINK) -o $@ sizecount.o ../phonetic.o ../ch_malloc.o $(LIBS) ldbmtest: ldbmtest.o ../libbackends.a $(OBJS2) $(LTLINK) -o ldbmtest ldbmtest.o $(OBJS2) ../libbackends.a $(LIBS) diff --git a/servers/slurpd/Makefile.in b/servers/slurpd/Makefile.in index 2e50c374b0..f14cc2507e 100644 --- a/servers/slurpd/Makefile.in +++ b/servers/slurpd/Makefile.in @@ -24,7 +24,9 @@ BUILD_SRV = @BUILD_SLURPD@ all-local-srv: slurpd -XLIBS = @SLURPD_LIBS@ -llthread @LTHREAD_LIBS@ $(KRB_LIBS) -llutil @LUTIL_LIBS@ +# $(LTHREAD_LIBS) must be last! +XLIBS = $(SLURPD_LIBS) $(LDAP_LIBS) +XXLIBS = $(KRB_LIBS) $(LDAP_LIBLTHREAD) slurpd: version.o $(LTLINK) -o $@ $(OBJS) version.o $(LIBS) @@ -32,7 +34,7 @@ slurpd: version.o sslurpd: version.o $(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS) -version.c: $(OBJS) $(LDAP_LIBDEPEND) +version.c: $(OBJS) $(LDAP_LIBDEPEND) $(LDAP_LIBTHREAD_DEPEND) $(RM) $@ (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 8bfc599a3c..a120e1434d 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -3,17 +3,16 @@ ## ## tests Makefile.in for OpenLDAP - -SCRIPTSDIR=./scripts - all-local: FORCE + @-$(LN_S) $(srcdir)/data . @echo "Initiating LDAP tests..."; \ - $(MKDIR) -p test-db test-repl ; \ - $(SCRIPTSDIR)/all $(SCRIPTSDIR) + $(MKDIR) test-db test-repl ; \ + $(srcdir)/scripts/all $(srcdir) clean-local: FORCE $(RM) test-db/[!C]* test-repl/[!C]* *core veryclean-local: FORCE + $(RM) data $(RM) -r test-db test-repl diff --git a/tests/scripts/all b/tests/scripts/all index 8d111d2c71..5dbdc61b2a 100755 --- a/tests/scripts/all +++ b/tests/scripts/all @@ -3,15 +3,16 @@ echo ">>>>> Executing all LDAP tests..." if [ $# -eq 0 ]; then - SCRIPTDIR="." + SRCDIR="." else - SCRIPTDIR=$1; shift + SRCDIR=$1; shift fi -for i in $SCRIPTDIR/test*; do - CMD=$i $* - echo ">>>>> Starting $CMD ..." - $CMD +echo ">>>>> Test Directory: $SRCDIR" + +for CMD in $SRCDIR/scripts/test*; do + echo ">>>>> Starting `basename $CMD` ..." + $CMD $SRCDIR RC=$? if [ $RC -eq 0 ]; then echo ">>>>> $CMD completed OK." diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh index cacc155837..f16d201317 100755 --- a/tests/scripts/defines.sh +++ b/tests/scripts/defines.sh @@ -1,3 +1,5 @@ +DATADIR=$SRCDIR/data + LDIF2LDBM=../servers/slapd/tools/ldif2ldbm SLAPD=../servers/slapd/slapd SLURPD=../servers/slurpd/slurpd @@ -8,12 +10,12 @@ PORT=9009 SLAVEPORT=9010 DBDIR=./test-db REPLDIR=./test-repl -CONF=./data/slapd-master.conf -ACLCONF=./data/slapd-acl.conf -MASTERCONF=./data/slapd-repl-master.conf -SLAVECONF=./data/slapd-repl-slave.conf -LDIF=./data/test.ldif -LDIFORDERED=./data/test-ordered.ldif +CONF=$DATADIR/slapd-master.conf +ACLCONF=$DATADIR/slapd-acl.conf +MASTERCONF=$DATADIR/slapd-repl-master.conf +SLAVECONF=$DATADIR/slapd-repl-slave.conf +LDIF=$DATADIR/test.ldif +LDIFORDERED=$DATADIR/test-ordered.ldif BASEDN="o=University of Michigan, c=US" MANAGERDN="cn=Manager, o=University of Michigan, c=US" PASSWD=secret @@ -29,10 +31,10 @@ LDIFFLT=$DBDIR/ldif.flt MASTEROUT=$DBDIR/master.out SLAVEOUT=$DBDIR/slave.out TESTOUT=$DBDIR/ldapsearch.out -SEARCHOUTMASTER=./data/search.out.master -MODIFYOUTMASTER=./data/modify.out.master -ADDDELOUTMASTER=./data/adddel.out.master -MODRDNOUTMASTER=./data/modrdn.out.master -ACLOUTMASTER=./data/acl.out.master -REPLOUTMASTER=./data/repl.out.master -MODSRCHFILTERS=./data/modify.search.filters +SEARCHOUTMASTER=$DATADIR/search.out.master +MODIFYOUTMASTER=$DATADIR/modify.out.master +ADDDELOUTMASTER=$DATADIR/adddel.out.master +MODRDNOUTMASTER=$DATADIR/modrdn.out.master +ACLOUTMASTER=$DATADIR/acl.out.master +REPLOUTMASTER=$DATADIR/repl.out.master +MODSRCHFILTERS=$DATADIR/modify.search.filters diff --git a/tests/scripts/test001-ldif2ldbm b/tests/scripts/test001-ldif2ldbm index 26d10fff94..49f00671b1 100755 --- a/tests/scripts/test001-ldif2ldbm +++ b/tests/scripts/test001-ldif2ldbm @@ -1,7 +1,16 @@ #!/bin/sh -. scripts/defines.sh +if [ $# -eq 0 ]; then + SRCDIR="." +else + SRCDIR=$1; shift +fi + +echo "running defines.sh $SRCDIR" + +. $SRCDIR/scripts/defines.sh $SRCDIR +echo "Datadir is $DATADIR" echo "Cleaning up in $DBDIR..." diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd index 26d10fff94..49f00671b1 100755 --- a/tests/scripts/test001-slapadd +++ b/tests/scripts/test001-slapadd @@ -1,7 +1,16 @@ #!/bin/sh -. scripts/defines.sh +if [ $# -eq 0 ]; then + SRCDIR="." +else + SRCDIR=$1; shift +fi + +echo "running defines.sh $SRCDIR" + +. $SRCDIR/scripts/defines.sh $SRCDIR +echo "Datadir is $DATADIR" echo "Cleaning up in $DBDIR..." diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate index 4f31092f48..d5f659b71d 100755 --- a/tests/scripts/test002-populate +++ b/tests/scripts/test002-populate @@ -1,7 +1,12 @@ #!/bin/sh -. scripts/defines.sh +if [ $# -eq 0 ]; then + SRCDIR="." +else + SRCDIR=$1; shift +fi +. $SRCDIR/scripts/defines.sh $SRCDIR echo "Cleaning up in $DBDIR..." @@ -45,9 +50,9 @@ if [ $RC != 0 ]; then fi echo "Filtering ldapsearch results..." -. scripts/acfilter.sh < $SEARCHOUT > $SEARCHFLT +. $SRCDIR/scripts/acfilter.sh < $SEARCHOUT > $SEARCHFLT echo "Filtering original ldif used to create database..." -. scripts/acfilter.sh < $LDIF > $LDIFFLT +. $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT echo "Comparing filter output..." cmp $SEARCHFLT $LDIFFLT diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search index 868ea4b840..661ccc219f 100755 --- a/tests/scripts/test003-search +++ b/tests/scripts/test003-search @@ -1,6 +1,12 @@ #!/bin/sh -. scripts/defines.sh +if [ $# -eq 0 ]; then + SRCDIR="." +else + SRCDIR=$1; shift +fi + +. $SRCDIR/scripts/defines.sh $SRCDIR echo "Cleaning up in $DBDIR..." diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify index 8f31d33c73..46d813e7e7 100755 --- a/tests/scripts/test004-modify +++ b/tests/scripts/test004-modify @@ -1,6 +1,12 @@ #!/bin/sh -. scripts/defines.sh +if [ $# -eq 0 ]; then + SRCDIR="." +else + SRCDIR=$1; shift +fi + +. $SRCDIR/scripts/defines.sh $SRCDIR echo "Cleaning up in $DBDIR..." diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn index 0211ada5ca..510f898554 100755 --- a/tests/scripts/test005-modrdn +++ b/tests/scripts/test005-modrdn @@ -1,5 +1,12 @@ #!/bin/sh -echo "modrdn test not yet written" +if [ $# -eq 0 ]; then + SRCDIR="." +else + SRCDIR=$1; shift +fi + +. $SRCDIR/scripts/defines.sh $SRCDIR +echo "modrdn test not yet written" exit 0 diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls index 3805692b0d..6979cf27fa 100755 --- a/tests/scripts/test006-acls +++ b/tests/scripts/test006-acls @@ -1,6 +1,12 @@ #!/bin/sh -. scripts/defines.sh +if [ $# -eq 0 ]; then + SRCDIR="." +else + SRCDIR=$1; shift +fi + +. $SRCDIR/scripts/defines.sh $SRCDIR echo "Cleaning up in $DBDIR..." @@ -96,7 +102,7 @@ EOMODS4 echo "Using ldapsearch to retrieve all the entries..." $LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \ - 'objectClass=*' | . scripts/acfilter.sh >> $SEARCHOUT 2>&1 + 'objectClass=*' | . $SRCDIR/scripts/acfilter.sh >> $SEARCHOUT 2>&1 RC=$? kill -HUP $PID if [ $RC != 0 ]; then diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication index 10190728fc..58bcfec0a1 100755 --- a/tests/scripts/test007-replication +++ b/tests/scripts/test007-replication @@ -10,7 +10,13 @@ # - retrieve database over ldap and compare against expected results # -. scripts/defines.sh +if [ $# -eq 0 ]; then + SRCDIR="." +else + SRCDIR=$1; shift +fi + +. $SRCDIR/scripts/defines.sh $SRCDIR if test ! -x $SLURPD ; then echo ">>>>> $SLURPD is not executable or do not exist." -- 2.39.5