From 5fdba2728822b5cb293b300021025b1a5d435a87 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 14 Jul 2001 17:34:24 +0000 Subject: [PATCH] This is the skeleton of back-monitor, the slapd monitoring backend. The old monitoring stuff has been removed; the new backend is enabled by using --enable-monitor at configure time and requires database monitor in slapd.conf to be activated. At present it implements a subset of the old monitoring options, and it should be extendable to a number of different subsystems. The search operation has been implementd; it does not honor abandon or size/time limits, though. The compare and the abandon operations are planned. Copyright Pierangelo Masarati ; the code is provided AS IS with NO GUARANTEE. It can be used and distributed under the conditions stated by the OpenLDAP Public License. --- configure | 2472 ++++++++--------- configure.in | 31 + include/ldap_defaults.h | 3 +- include/portable.h.in | 6 + servers/slapd/Makefile.in | 4 +- servers/slapd/back-monitor/Copyright | 29 + servers/slapd/back-monitor/Makefile.in | 39 + servers/slapd/back-monitor/README | 33 + servers/slapd/back-monitor/abandon.c | 52 + servers/slapd/back-monitor/back-monitor.h | 191 ++ servers/slapd/back-monitor/backend.c | 163 ++ servers/slapd/back-monitor/cache.c | 244 ++ servers/slapd/back-monitor/compare.c | 56 + servers/slapd/back-monitor/conn.c | 316 +++ servers/slapd/back-monitor/database.c | 169 ++ servers/slapd/back-monitor/dummy.c | 51 + servers/slapd/back-monitor/entry.c | 98 + servers/slapd/back-monitor/external.h | 69 + servers/slapd/back-monitor/init.c | 430 +++ .../slapd/back-monitor/proto-back-monitor.h | 83 + servers/slapd/back-monitor/rww.c | 134 + servers/slapd/back-monitor/search.c | 195 ++ servers/slapd/back-monitor/thread.c | 81 + servers/slapd/backend.c | 6 + servers/slapd/config.c | 15 + servers/slapd/monitor.c | 266 -- servers/slapd/proto-slap.h | 5 +- servers/slapd/schema/core.schema | 19 + servers/slapd/search.c | 28 - servers/slapd/tools/mimic.c | 23 + 30 files changed, 3739 insertions(+), 1572 deletions(-) create mode 100644 servers/slapd/back-monitor/Copyright create mode 100644 servers/slapd/back-monitor/Makefile.in create mode 100644 servers/slapd/back-monitor/README create mode 100644 servers/slapd/back-monitor/abandon.c create mode 100644 servers/slapd/back-monitor/back-monitor.h create mode 100644 servers/slapd/back-monitor/backend.c create mode 100644 servers/slapd/back-monitor/cache.c create mode 100644 servers/slapd/back-monitor/compare.c create mode 100644 servers/slapd/back-monitor/conn.c create mode 100644 servers/slapd/back-monitor/database.c create mode 100644 servers/slapd/back-monitor/dummy.c create mode 100644 servers/slapd/back-monitor/entry.c create mode 100644 servers/slapd/back-monitor/external.h create mode 100644 servers/slapd/back-monitor/init.c create mode 100644 servers/slapd/back-monitor/proto-back-monitor.h create mode 100644 servers/slapd/back-monitor/rww.c create mode 100644 servers/slapd/back-monitor/search.c create mode 100644 servers/slapd/back-monitor/thread.c delete mode 100644 servers/slapd/monitor.c diff --git a/configure b/configure index 5fc05db1ce..5996135568 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # $OpenLDAP$ -# from OpenLDAP: pkg/ldap/configure.in,v 1.361 2001/06/22 16:10:55 kurt Exp +# from OpenLDAP: pkg/ldap/configure.in,v 1.362 2001/07/07 03:28:31 kurt Exp # Copyright 1998-2001 The OpenLDAP Foundation. All Rights Reserved. # @@ -14,7 +14,7 @@ echo "Copyright 1998-2001 The OpenLDAP Foundation, All Rights Reserved." echo "Restrictions apply, see COPYRIGHT and LICENSE files." # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13.1 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -113,6 +113,10 @@ ac_help="$ac_help --enable-meta enable metadirectory backend [no]" ac_help="$ac_help --with-meta-module module type [static]" +ac_help="$ac_help + --enable-monitor enable monitor backend [no]" +ac_help="$ac_help + --with-monitor-module module type [static]" ac_help="$ac_help --enable-passwd enable passwd backend [no]" ac_help="$ac_help @@ -471,7 +475,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13.1" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -671,18 +675,14 @@ for ac_dir in build $srcdir/build; do ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break fi done if test -z "$ac_aux_dir"; then { echo "configure: error: can not find install-sh or install.sh in build $srcdir/build" 1>&2; exit 1; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. eval `$ac_aux_dir/version.sh` if test -z "$OL_STRING"; then @@ -692,127 +692,6 @@ fi echo "Configuring $OL_STRING ..." -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:697: checking host system type" >&5 -if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then - -# Make sure we can run config.sub. - if $ac_config_sub sun4 >/dev/null 2>&1; then : - else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } - fi - - ac_cv_host_alias=$host - case "$ac_cv_host_alias" in - NONE) - case $nonopt in - NONE) - if ac_cv_host_alias=`$ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) ac_cv_host_alias=$nonopt ;; - esac ;; - esac - - ac_cv_host=`$ac_config_sub $ac_cv_host_alias` - ac_cv_host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - ac_cv_host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - ac_cv_host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -else - echo $ac_n "(cached) $ac_c" 1>&6 -fi - -echo "$ac_t""$ac_cv_host" 1>&6 - -host=$ac_cv_host -host_alias=$ac_cv_host_alias -host_cpu=$ac_cv_host_cpu -host_vendor=$ac_cv_host_vendor -host_os=$ac_cv_host_os - - - - - -echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:738: checking target system type" >&5 -if test "x$ac_cv_target" = "x" || (test "x$target" != "xNONE" && test "x$target" != "x$ac_cv_target_alias"); then - -# Make sure we can run config.sub. - if $ac_config_sub sun4 >/dev/null 2>&1; then : - else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } - fi - - ac_cv_target_alias=$target - case "$ac_cv_target_alias" in - NONE) - case $nonopt in - NONE) - ac_cv_target_alias=$host_alias ;; - - *) ac_cv_target_alias=$nonopt ;; - esac ;; - esac - - ac_cv_target=`$ac_config_sub $ac_cv_target_alias` - ac_cv_target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - ac_cv_target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - ac_cv_target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -else - echo $ac_n "(cached) $ac_c" 1>&6 -fi - -echo "$ac_t""$ac_cv_target" 1>&6 - -target=$ac_cv_target -target_alias=$ac_cv_target_alias -target_cpu=$ac_cv_target_cpu -target_vendor=$ac_cv_target_vendor -target_os=$ac_cv_target_os - - - - - -echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:778: checking build system type" >&5 -if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then - -# Make sure we can run config.sub. - if $ac_config_sub sun4 >/dev/null 2>&1; then : - else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } - fi - - ac_cv_build_alias=$build - case "$ac_cv_build_alias" in - NONE) - case $nonopt in - NONE) - ac_cv_build_alias=$host_alias ;; - - *) ac_cv_build_alias=$nonopt ;; - esac ;; - esac - - ac_cv_build=`$ac_config_sub $ac_cv_build_alias` - ac_cv_build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - ac_cv_build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - ac_cv_build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -else - echo $ac_n "(cached) $ac_c" 1>&6 -fi - -echo "$ac_t""$ac_cv_build" 1>&6 - -build=$ac_cv_build -build_alias=$ac_cv_build_alias -build_cpu=$ac_cv_build_cpu -build_vendor=$ac_cv_build_vendor -build_os=$ac_cv_build_os - - - - - # Do some error checking and defaulting for the host and target type. # The inputs are: # configure --host=HOST --target=TARGET --build=BUILD NONOPT @@ -833,6 +712,69 @@ NONE---*---* | *---NONE---* | *---*---NONE) ;; *) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; esac + +# Make sure we can run config.sub. +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +fi + +echo $ac_n "checking host system type""... $ac_c" 1>&6 +echo "configure:723: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 + +echo $ac_n "checking target system type""... $ac_c" 1>&6 +echo "configure:744: checking target system type" >&5 + +target_alias=$target +case "$target_alias" in +NONE) + case $nonopt in + NONE) target_alias=$host_alias ;; + *) target_alias=$nonopt ;; + esac ;; +esac + +target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` +target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$target" 1>&6 + +echo $ac_n "checking build system type""... $ac_c" 1>&6 +echo "configure:762: checking build system type" >&5 + +build_alias=$build +case "$build_alias" in +NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +esac + +build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` +build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$build" 1>&6 + test "$host_alias" != "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && @@ -851,9 +793,9 @@ test "$host_alias" != "$target_alias" && # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:855: checking for a BSD compatible install" >&5 +echo "configure:797: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then -if eval "test \"\${ac_cv_path_install+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" @@ -871,10 +813,6 @@ else grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : - elif test $ac_prog = install && - grep pwplus $ac_dir/$ac_prog >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : else ac_cv_path_install="$ac_dir/$ac_prog -c" break 2 @@ -903,12 +841,12 @@ echo "$ac_t""$INSTALL" 1>&6 # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:912: checking whether build environment is sane" >&5 +echo "configure:850: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -956,21 +894,21 @@ EOF_SED rm -f conftestsed fi test "$program_prefix" != NONE && - program_transform_name="s,^,${program_prefix},;$program_transform_name" + program_transform_name="s,^,${program_prefix},; $program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$\$,${program_suffix},;$program_transform_name" + program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" # sed with no file args requires a program. test "$program_transform_name" = "" && program_transform_name="s,x,x," -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:973: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_AWK+set}\" = set"; then +echo "configure:911: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AWK"; then @@ -999,9 +937,9 @@ test -n "$AWK" && break done echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1003: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:941: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftestmake <<\EOF @@ -1039,7 +977,7 @@ fi missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1043: checking for working aclocal" >&5 +echo "configure:981: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1052,7 +990,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1056: checking for working autoconf" >&5 +echo "configure:994: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1065,7 +1003,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1069: checking for working automake" >&5 +echo "configure:1007: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1078,7 +1016,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1082: checking for working autoheader" >&5 +echo "configure:1020: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1091,7 +1029,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1095: checking for working makeinfo" >&5 +echo "configure:1033: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1111,8 +1049,8 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1115: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_AMTAR+set}\" = set"; then +echo "configure:1053: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AMTAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AMTAR"; then @@ -1179,7 +1117,7 @@ OPENLDAP_LIBVERSION=$OL_API_LIB echo $ac_n "checking configure arguments""... $ac_c" 1>&6 -echo "configure:1183: checking configure arguments" >&5 +echo "configure:1121: checking configure arguments" >&5 top_builddir=`pwd` @@ -2070,6 +2008,47 @@ else fi # end --with-meta_module +# OpenLDAP --enable-monitor + # Check whether --enable-monitor or --disable-monitor was given. +if test "${enable_monitor+set}" = set; then + enableval="$enable_monitor" + + ol_arg=invalid + for ol_val in auto yes no ; do + if test "$enableval" = "$ol_val" ; then + ol_arg="$ol_val" + fi + done + if test "$ol_arg" = "invalid" ; then + { echo "configure: error: bad value $enableval for --enable-monitor" 1>&2; exit 1; } + fi + ol_enable_monitor="$ol_arg" + +else + ol_enable_monitor="no" +fi +# end --enable-monitor +# OpenLDAP --with-monitor_module + # Check whether --with-monitor_module or --without-monitor_module was given. +if test "${with_monitor_module+set}" = set; then + withval="$with_monitor_module" + + ol_arg=invalid + for ol_val in static dynamic ; do + if test "$withval" = "$ol_val" ; then + ol_arg="$ol_val" + fi + done + if test "$ol_arg" = "invalid" ; then + { echo "configure: error: bad value $withval for --with-monitor_module" 1>&2; exit 1; } + fi + ol_with_monitor_module="$ol_arg" + +else + ol_with_monitor_module="static" +fi +# end --with-monitor_module + # OpenLDAP --enable-passwd # Check whether --enable-passwd or --disable-passwd was given. if test "${enable_passwd+set}" = set; then @@ -2374,6 +2353,9 @@ if test $ol_enable_slapd = no ; then if test $ol_enable_meta = yes ; then echo "configure: warning: slapd disabled, ignoring --enable-meta argument" 1>&2 fi + if test $ol_enable_module = yes ; then + echo "configure: warning: slapd disabled, ignoring --enable-monitor argument" 1>&2 + fi if test $ol_enable_passwd = yes ; then echo "configure: warning: slapd disabled, ignoring --enable-passwd argument" 1>&2 fi @@ -2425,6 +2407,9 @@ if test $ol_enable_slapd = no ; then if test $ol_with_meta_module != static ; then echo "configure: warning: slapd disabled, ignoring --with-meta-module argument" 1>&2 fi + if test $ol_with_monitor_module != static ; then + echo "configure: warning: slapd disabled, ignoring --with-monitor-module argument" 1>&2 + fi if test $ol_with_passwd_module != static ; then echo "configure: warning: slapd disabled, ignoring --with-passwd-module argument" 1>&2 fi @@ -2453,6 +2438,7 @@ if test $ol_enable_slapd = no ; then ol_enable_ldap=no ol_enable_ldbm=no ol_enable_meta=no + ol_enable_monitor=no ol_enable_passwd=no ol_enable_perl=no ol_enable_shell=no @@ -2474,6 +2460,7 @@ if test $ol_enable_slapd = no ; then ol_with_ldap_module=static ol_with_ldbm_module=static ol_with_meta_module=static + ol_with_monitor_module=static ol_with_passwd_module=static ol_with_perl_module=static ol_with_shell_module=static @@ -2503,6 +2490,7 @@ elif test $ol_enable_ldbm = no ; then $ol_enable_dnssrv = no -a \ $ol_enable_ldap = no -a \ $ol_enable_meta = no -a \ + $ol_enable_monitor = no -a \ $ol_enable_passwd = no -a \ $ol_enable_perl = no -a \ $ol_enable_shell = no -a \ @@ -2582,6 +2570,7 @@ BUILD_DNSSRV=no BUILD_LDAP=no BUILD_LDBM=no BUILD_META=no +BUILD_MONITOR=no BUILD_PASSWD=no BUILD_PERL=no BUILD_SHELL=no @@ -2593,6 +2582,7 @@ BUILD_DNSSRV_DYNAMIC=static BUILD_LDAP_DYNAMIC=static BUILD_LDBM_DYNAMIC=static BUILD_META_DYNAMIC=static +BUILD_MONITOR_DYNAMIC=static BUILD_PASSWD_DYNAMIC=static BUILD_PERL_DYNAMIC=static BUILD_SHELL_DYNAMIC=static @@ -2649,8 +2639,8 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2653: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:2643: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then @@ -2701,8 +2691,8 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2705: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:2695: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then @@ -2761,8 +2751,8 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2765: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_RANLIB+set}\" = set"; then +echo "configure:2755: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then @@ -2791,8 +2781,8 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2795: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:2785: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then @@ -2821,8 +2811,8 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2825: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:2815: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then @@ -2868,12 +2858,12 @@ fi if test -z "$CC"; then case "`uname -s`" in - *win32* | *WIN32* | *CYGWIN*) + *win32* | *WIN32*) # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2876: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:2866: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then @@ -2903,8 +2893,8 @@ fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2908: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:2898: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2915,12 +2905,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2919 "configure" +#line 2909 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2945,14 +2935,14 @@ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2950: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:2940: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2955: checking whether we are using GNU C" >&5 -if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then +echo "configure:2945: checking whether we are using GNU C" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2979,8 +2969,8 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2983: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then +echo "configure:2973: checking whether ${CC-cc} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo 'void f(){}' > conftest.c @@ -3022,7 +3012,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:3026: checking for ld used by GCC" >&5 +echo "configure:3016: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -3046,12 +3036,12 @@ echo "configure:3026: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:3050: checking for GNU ld" >&5 +echo "configure:3040: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:3053: checking for non-GNU ld" >&5 +echo "configure:3043: checking for non-GNU ld" >&5 fi -if eval "test \"\${ac_cv_path_LD+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -z "$LD"; then @@ -3084,8 +3074,8 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:3088: checking if the linker ($LD) is GNU ld" >&5 -if eval "test \"\${ac_cv_prog_gnu_ld+set}\" = set"; then +echo "configure:3078: checking if the linker ($LD) is GNU ld" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. @@ -3100,8 +3090,8 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:3104: checking for BSD-compatible nm" >&5 -if eval "test \"\${ac_cv_path_NM+set}\" = set"; then +echo "configure:3094: checking for BSD-compatible nm" >&5 +if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$NM"; then @@ -3136,8 +3126,8 @@ NM="$ac_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:3140: checking whether ln -s works" >&5 -if eval "test \"\${ac_cv_prog_LN_S+set}\" = set"; then +echo "configure:3130: checking whether ln -s works" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftestdata @@ -3191,8 +3181,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" case "$lt_target" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3195 "configure"' > conftest.$ac_ext - if { (eval echo configure:3196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 3185 "configure"' > conftest.$ac_ext + if { (eval echo configure:3186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -3213,19 +3203,19 @@ case "$lt_target" in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:3217: checking whether the C compiler needs -belf" >&5 -if eval "test \"\${lt_cv_cc_needs_belf+set}\" = set"; then +echo "configure:3207: checking whether the C compiler needs -belf" >&5 +if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -3248,8 +3238,8 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3252: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_DLLTOOL+set}\" = set"; then +echo "configure:3242: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$DLLTOOL"; then @@ -3280,8 +3270,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3284: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_DLLTOOL+set}\" = set"; then +echo "configure:3274: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$DLLTOOL"; then @@ -3315,8 +3305,8 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3319: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_AS+set}\" = set"; then +echo "configure:3309: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AS"; then @@ -3347,8 +3337,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3351: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_AS+set}\" = set"; then +echo "configure:3341: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AS"; then @@ -3382,8 +3372,8 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3386: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_OBJDUMP+set}\" = set"; then +echo "configure:3376: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$OBJDUMP"; then @@ -3414,8 +3404,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3418: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_OBJDUMP+set}\" = set"; then +echo "configure:3408: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$OBJDUMP"; then @@ -3477,13 +3467,13 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' exec 5>>./config.log -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3486: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_AWK+set}\" = set"; then +echo "configure:3476: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AWK"; then @@ -3513,8 +3503,8 @@ done # test for ln hardlink support echo $ac_n "checking whether ln works""... $ac_c" 1>&6 -echo "configure:3517: checking whether ln works" >&5 -if eval "test \"\${ol_cv_prog_LN_H+set}\" = set"; then +echo "configure:3507: checking whether ln works" >&5 +if eval "test \"`echo '$''{'ol_cv_prog_LN_H'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest.src conftest.dst @@ -3536,8 +3526,8 @@ else fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:3540: checking whether ln -s works" >&5 -if eval "test \"\${ac_cv_prog_LN_S+set}\" = set"; then +echo "configure:3530: checking whether ln -s works" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftestdata @@ -3564,15 +3554,15 @@ fi # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3568: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_path_SENDMAIL+set}\" = set"; then +echo "configure:3558: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else case "$SENDMAIL" in /*) ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a path. ;; - ?:/*) + ?:/*) ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a dos path. ;; *) @@ -3600,15 +3590,15 @@ fi # Extract the first word of "vi", so it can be a program name with args. set dummy vi; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3604: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_path_EDITOR+set}\" = set"; then +echo "configure:3594: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_EDITOR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else case "$EDITOR" in /*) ac_cv_path_EDITOR="$EDITOR" # Let the user override the test with a path. ;; - ?:/*) + ?:/*) ac_cv_path_EDITOR="$EDITOR" # Let the user override the test with a dos path. ;; *) @@ -3636,15 +3626,15 @@ fi # Extract the first word of "finger", so it can be a program name with args. set dummy finger; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3640: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_path_FINGER+set}\" = set"; then +echo "configure:3630: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_FINGER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else case "$FINGER" in /*) ac_cv_path_FINGER="$FINGER" # Let the user override the test with a path. ;; - ?:/*) + ?:/*) ac_cv_path_FINGER="$FINGER" # Let the user override the test with a dos path. ;; *) @@ -3675,15 +3665,15 @@ if test $ol_enable_perl != no ; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3679: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_path_PERLBIN+set}\" = set"; then +echo "configure:3669: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PERLBIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else case "$PERLBIN" in /*) ac_cv_path_PERLBIN="$PERLBIN" # Let the user override the test with a path. ;; - ?:/*) + ?:/*) ac_cv_path_PERLBIN="$PERLBIN" # Let the user override the test with a dos path. ;; *) @@ -3726,13 +3716,13 @@ fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:3730: checking how to run the C preprocessor" >&5 +echo "configure:3720: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then -if eval "test \"\${ac_cv_prog_CPP+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else # This must be in double quotes, not single quotes, because CPP may get @@ -3741,13 +3731,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3758,13 +3748,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3775,13 +3765,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3819,9 +3809,9 @@ elif test $cross_compiling = yes -a $ol_enable_x_compile = no; then fi echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:3823: checking for AIX" >&5 +echo "configure:3813: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:3847: checking for POSIXized ISC" >&5 +echo "configure:3837: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -3865,17 +3855,17 @@ fi ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:3869: checking for minix/config.h" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:3859: checking for minix/config.h" >&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:3879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3914,12 +3904,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:3918: checking for Cygwin environment" >&5 -if eval "test \"\${ac_cv_cygwin+set}\" = set"; then +echo "configure:3908: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -3940,25 +3930,26 @@ else ac_cv_cygwin=no fi rm -f conftest* +rm -f conftest* fi echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:3950: checking for mingw32 environment" >&5 -if eval "test \"\${ac_cv_mingw32+set}\" = set"; then +echo "configure:3941: checking for mingw32 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -3968,57 +3959,29 @@ else ac_cv_mingw32=no fi rm -f conftest* +rm -f conftest* fi echo "$ac_t""$ac_cv_mingw32" 1>&6 MINGW32= test "$ac_cv_mingw32" = yes && MINGW32=yes -echo $ac_n "checking for EMX OS/2 environment""... $ac_c" 1>&6 -echo "configure:3978: checking for EMX OS/2 environment" >&5 -if eval "test \"\${ac_cv_emxos2+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_emxos2=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_emxos2=no -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_emxos2" 1>&6 -EMXOS2= -test "$ac_cv_emxos2" = yes && EMXOS2=yes - echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:4009: checking for executable suffix" >&5 -if eval "test \"\${ac_cv_exeext+set}\" = set"; then +echo "configure:3972: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then + if test "$CYGWIN" = yes || test "$MINGW32" = yes; then ac_cv_exeext=.exe else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:4019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:3982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.C | *.o | *.obj | *.xcoff) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -4036,13 +3999,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:4040: checking for object suffix" >&5 -if eval "test \"\${ac_cv_objext+set}\" = set"; then +echo "configure:4003: checking for object suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:4046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -4066,15 +4029,15 @@ EOF echo $ac_n "checking for be_app in -lbe""... $ac_c" 1>&6 -echo "configure:4070: checking for be_app in -lbe" >&5 -ac_lib_var=`echo be'_'be_app | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:4033: checking for be_app in -lbe" >&5 +ac_lib_var=`echo be'_'be_app | 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="-lbe -lroot -lnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4111,8 +4074,8 @@ fi echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:4115: checking for ${CC-cc} option to accept ANSI C" >&5 -if eval "test \"\${am_cv_prog_cc_stdc+set}\" = set"; then +echo "configure:4078: checking for ${CC-cc} option to accept ANSI C" >&5 +if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else am_cv_prog_cc_stdc=no @@ -4128,7 +4091,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" cat > conftest.$ac_ext < #include @@ -4165,7 +4128,7 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ; return 0; } EOF -if { (eval echo configure:4169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_prog_cc_stdc="$ac_arg"; break else @@ -4199,8 +4162,8 @@ if test -z "${MKDEP}"; then OL_MKDEP="${CC-cc}" if test -z "${MKDEP_FLAGS}"; then echo $ac_n "checking for ${OL_MKDEP} depend flag""... $ac_c" 1>&6 -echo "configure:4203: checking for ${OL_MKDEP} depend flag" >&5 -if eval "test \"\${ol_cv_mkdep+set}\" = set"; then +echo "configure:4166: checking for ${OL_MKDEP} depend flag" >&5 +if eval "test \"`echo '$''{'ol_cv_mkdep'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4209,7 +4172,7 @@ else cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } \ + if { ac_try='$OL_MKDEP $flag conftest.c'; { (eval echo configure:4176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \ | egrep '^conftest\.'"${ac_objext}" >/dev/null 2>&1 then if test ! -f conftest."${ac_object}" ; then @@ -4242,15 +4205,15 @@ if test "${ol_cv_mkdep}" = no ; then fi echo $ac_n "checking for afopen in -ls""... $ac_c" 1>&6 -echo "configure:4246: checking for afopen in -ls" >&5 -ac_lib_var=`echo s'_'afopen | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:4209: checking for afopen in -ls" >&5 +ac_lib_var=`echo s'_'afopen | 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="-ls $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4295,17 +4258,17 @@ if test $ol_enable_modules != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4299: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:4262: 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:4309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4337,15 +4300,15 @@ done fi echo $ac_n "checking for lt_dlinit in -lltdl""... $ac_c" 1>&6 -echo "configure:4341: checking for lt_dlinit in -lltdl" >&5 -ac_lib_var=`echo ltdl'_'lt_dlinit | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:4304: checking for lt_dlinit in -lltdl" >&5 +ac_lib_var=`echo ltdl'_'lt_dlinit | 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="-lltdl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4393,6 +4356,7 @@ else ol_with_ldap_module=static ol_with_ldbm_module=static ol_with_meta_module=static + ol_with_monitor_module=static ol_with_passwd_module=static ol_with_perl_module=static ol_with_shell_module=static @@ -4402,13 +4366,13 @@ fi # test for EBCDIC echo $ac_n "checking for EBCDIC""... $ac_c" 1>&6 -echo "configure:4406: checking for EBCDIC" >&5 -if eval "test \"\${ol_cv_cpp_ebcdic+set}\" = set"; then +echo "configure:4370: checking for EBCDIC" >&5 +if eval "test \"`echo '$''{'ol_cv_cpp_ebcdic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4441,12 +4405,12 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4445: checking for ANSI C header files" >&5 -if eval "test \"\${ol_cv_header_stdc+set}\" = set"; then +echo "configure:4409: checking for ANSI C header files" >&5 +if eval "test \"`echo '$''{'ol_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4454,7 +4418,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4471,7 +4435,7 @@ rm -f conftest* if test $ol_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4489,7 +4453,7 @@ fi if test $ol_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4510,7 +4474,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #ifndef HAVE_EBCDIC @@ -4528,7 +4492,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:4532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4562,12 +4526,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:4566: checking for $ac_hdr that defines DIR" >&5 -if eval "test \"\${ac_cv_header_dirent_$ac_safe+set}\" = set"; then +echo "configure:4530: 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> @@ -4575,7 +4539,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:4579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -4600,15 +4564,15 @@ 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:4604: checking for opendir in -ldir" >&5 -ac_lib_var=`echo dir'_'opendir | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:4568: 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 else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4641,15 +4605,15 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:4645: checking for opendir in -lx" >&5 -ac_lib_var=`echo x'_'opendir | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:4609: 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 else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4683,12 +4647,12 @@ fi fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:4687: checking for sys/wait.h that is POSIX.1 compatible" >&5 -if eval "test \"\${ac_cv_header_sys_wait_h+set}\" = set"; then +echo "configure:4651: 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 @@ -4704,7 +4668,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:4708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -4725,12 +4689,12 @@ EOF fi echo $ac_n "checking POSIX termios""... $ac_c" 1>&6 -echo "configure:4729: checking POSIX termios" >&5 -if eval "test \"\${am_cv_sys_posix_termios+set}\" = set"; then +echo "configure:4693: 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 @@ -4740,7 +4704,7 @@ int main() { tcgetattr(0, 0); ; return 0; } EOF -if { (eval echo configure:4744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_sys_posix_termios=yes else @@ -4756,8 +4720,8 @@ 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:4760: checking whether use of TIOCGWINSZ requires sys/ioctl.h" >&5 -if eval "test \"\${am_cv_sys_tiocgwinsz_needs_sys_ioctl_h+set}\" = set"; then +echo "configure:4724: 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 am_cv_sys_tiocgwinsz_needs_sys_ioctl_h=no @@ -4765,7 +4729,7 @@ else gwinsz_in_termios_h=no if test $am_cv_sys_posix_termios = yes; then cat > conftest.$ac_ext < # include @@ -4785,7 +4749,7 @@ rm -f conftest* if test $gwinsz_in_termios_h = no; then cat > conftest.$ac_ext < # include @@ -4868,17 +4832,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:4872: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:4836: 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:4882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4908,12 +4872,12 @@ done echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4912: checking for dlopen" >&5 -if eval "test \"\${ac_cv_func_dlopen+set}\" = set"; then +echo "configure:4876: checking for dlopen" >&5 +if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -4955,15 +4918,15 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4959: checking for dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:4922: checking for dlopen in -ldl" >&5 +ac_lib_var=`echo dl'_'dlopen | 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="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5005,15 +4968,15 @@ fi echo $ac_n "checking for sigset in -lV3""... $ac_c" 1>&6 -echo "configure:5009: checking for sigset in -lV3" >&5 -ac_lib_var=`echo V3'_'sigset | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:4972: checking for sigset in -lV3" >&5 +ac_lib_var=`echo V3'_'sigset | 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="-lV3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5054,12 +5017,12 @@ fi if test $ac_cv_header_winsock_h = yes; then echo $ac_n "checking for winsock""... $ac_c" 1>&6 -echo "configure:5058: checking for winsock" >&5 -if eval "test \"\${ol_cv_winsock+set}\" = set"; then +echo "configure:5021: checking for winsock" >&5 +if eval "test \"`echo '$''{'ol_cv_winsock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -5071,7 +5034,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_winsock=yes else @@ -5099,12 +5062,12 @@ fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:5103: checking for socket" >&5 -if eval "test \"\${ac_cv_func_socket+set}\" = set"; then +echo "configure:5066: checking for socket" >&5 +if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -5147,22 +5109,22 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:5151: checking for main in -lsocket" >&5 -ac_lib_var=`echo socket'_'main | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:5113: checking for main in -lsocket" >&5 +ac_lib_var=`echo socket'_'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 else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5190,22 +5152,22 @@ else fi echo $ac_n "checking for main in -lnet""... $ac_c" 1>&6 -echo "configure:5194: checking for main in -lnet" >&5 -ac_lib_var=`echo net'_'main | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:5156: checking for main in -lnet" >&5 +ac_lib_var=`echo net'_'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 else ac_save_LIBS="$LIBS" LIBS="-lnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5233,22 +5195,22 @@ else fi echo $ac_n "checking for main in -lnsl_s""... $ac_c" 1>&6 -echo "configure:5237: checking for main in -lnsl_s" >&5 -ac_lib_var=`echo nsl_s'_'main | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:5199: checking for main in -lnsl_s" >&5 +ac_lib_var=`echo nsl_s'_'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 else ac_save_LIBS="$LIBS" LIBS="-lnsl_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5276,22 +5238,22 @@ else fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:5280: checking for main in -lnsl" >&5 -ac_lib_var=`echo nsl'_'main | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:5242: checking for main in -lnsl" >&5 +ac_lib_var=`echo nsl'_'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 else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5319,15 +5281,15 @@ else fi echo $ac_n "checking for socket in -linet""... $ac_c" 1>&6 -echo "configure:5323: checking for socket in -linet" >&5 -ac_lib_var=`echo inet'_'socket | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:5285: checking for socket in -linet" >&5 +ac_lib_var=`echo inet'_'socket | 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="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5366,22 +5328,22 @@ else fi echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6 -echo "configure:5370: checking for main in -lgen" >&5 -ac_lib_var=`echo gen'_'main | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:5332: checking for main in -lgen" >&5 +ac_lib_var=`echo gen'_'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 else ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5413,12 +5375,12 @@ fi echo $ac_n "checking for select""... $ac_c" 1>&6 -echo "configure:5417: checking for select" >&5 -if eval "test \"\${ac_cv_func_select+set}\" = set"; then +echo "configure:5379: checking for select" >&5 +if eval "test \"`echo '$''{'ac_cv_func_select'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_select=yes" else @@ -5465,21 +5426,21 @@ fi if test "${ac_cv_header_winsock_h}" != yes; then echo $ac_n "checking types of arguments for select()""... $ac_c" 1>&6 -echo "configure:5469: checking types of arguments for select()" >&5 - if eval "test \"\${ac_cv_func_select_arg234+set}\" = set"; then +echo "configure:5430: checking types of arguments for select()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_select_arg234'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if eval "test \"\${ac_cv_func_select_arg1+set}\" = set"; then + if eval "test \"`echo '$''{'ac_cv_func_select_arg1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if eval "test \"\${ac_cv_func_select_arg5+set}\" = set"; then + if eval "test \"`echo '$''{'ac_cv_func_select_arg5'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_cv_func_select_arg234 in 'fd_set *' 'int *' 'void *'; do for ac_cv_func_select_arg1 in 'int' 'size_t' 'unsigned long' 'unsigned'; do for ac_cv_func_select_arg5 in 'struct timeval *' 'const struct timeval *'; do cat > conftest.$ac_ext < @@ -5498,7 +5459,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_not_found=no ; break 3 else @@ -5543,17 +5504,17 @@ for ac_hdr in regex.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5547: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:5508: 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:5557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5583,12 +5544,12 @@ if test "$ac_cv_header_regex_h" != yes ; then { echo "configure: error: POSIX regex.h required." 1>&2; exit 1; } fi echo $ac_n "checking for regfree""... $ac_c" 1>&6 -echo "configure:5587: checking for regfree" >&5 -if eval "test \"\${ac_cv_func_regfree+set}\" = set"; then +echo "configure:5548: checking for regfree" >&5 +if eval "test \"`echo '$''{'ac_cv_func_regfree'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_regfree=yes" else @@ -5635,8 +5595,8 @@ fi echo $ac_n "checking for compatible POSIX regex""... $ac_c" 1>&6 -echo "configure:5639: checking for compatible POSIX regex" >&5 -if eval "test \"\${ol_cv_c_posix_regex+set}\" = set"; then +echo "configure:5599: checking for compatible POSIX regex" >&5 +if eval "test \"`echo '$''{'ol_cv_c_posix_regex'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5644,7 +5604,7 @@ else ol_cv_c_posix_regex=cross else cat > conftest.$ac_ext < @@ -5670,7 +5630,7 @@ main() return rc; } EOF -if { (eval echo configure:5674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_c_posix_regex=yes else @@ -5692,12 +5652,12 @@ fi ol_link_dnssrv=no echo $ac_n "checking for res_query""... $ac_c" 1>&6 -echo "configure:5696: checking for res_query" >&5 -if eval "test \"\${ac_cv_func_res_query+set}\" = set"; then +echo "configure:5656: checking for res_query" >&5 +if eval "test \"`echo '$''{'ac_cv_func_res_query'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_res_query=yes" else @@ -5742,15 +5701,15 @@ fi if test $ac_cv_func_res_query = no ; then echo $ac_n "checking for res_query in -lbind""... $ac_c" 1>&6 -echo "configure:5746: checking for res_query in -lbind" >&5 -ac_lib_var=`echo bind'_'res_query | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:5705: checking for res_query in -lbind" >&5 +ac_lib_var=`echo bind'_'res_query | 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="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5793,15 +5752,15 @@ fi if test $ac_cv_func_res_query = no ; then echo $ac_n "checking for __res_query in -lbind""... $ac_c" 1>&6 -echo "configure:5797: checking for __res_query in -lbind" >&5 -ac_lib_var=`echo bind'_'__res_query | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:5756: checking for __res_query in -lbind" >&5 +ac_lib_var=`echo bind'_'__res_query | 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="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5844,15 +5803,15 @@ fi if test $ac_cv_func_res_query = no ; then echo $ac_n "checking for res_query in -lresolv""... $ac_c" 1>&6 -echo "configure:5848: checking for res_query in -lresolv" >&5 -ac_lib_var=`echo resolv'_'res_query | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:5807: checking for res_query in -lresolv" >&5 +ac_lib_var=`echo resolv'_'res_query | 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="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5911,12 +5870,12 @@ fi for ac_func in getaddrinfo inet_ntop do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5915: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:5874: 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${ac_exeext}; then +if { (eval echo configure:5902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5974,12 +5932,12 @@ else for ac_func in gai_strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5978: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:5936: 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${ac_exeext}; then +if { (eval echo configure:5964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6029,13 +5986,13 @@ done echo $ac_n "checking INET6_ADDRSTRLEN""... $ac_c" 1>&6 -echo "configure:6033: checking INET6_ADDRSTRLEN" >&5 -if eval "test \"\${ol_cv_inet6_addrstrlen+set}\" = set"; then +echo "configure:5990: checking INET6_ADDRSTRLEN" >&5 +if eval "test \"`echo '$''{'ol_cv_inet6_addrstrlen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6070,17 +6027,17 @@ if test $ol_enable_local != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6074: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:6031: 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:6084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6127,17 +6084,17 @@ if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6131: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:6088: 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:6141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6169,17 +6126,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6173: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:6130: 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:6183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6213,22 +6170,22 @@ done if test $krb5_impl = mit; then echo $ac_n "checking for main in -lkrb5""... $ac_c" 1>&6 -echo "configure:6217: checking for main in -lkrb5" >&5 -ac_lib_var=`echo krb5'_'main | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:6174: checking for main in -lkrb5" >&5 +ac_lib_var=`echo krb5'_'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 else ac_save_LIBS="$LIBS" LIBS="-lkrb5 -lcrypto -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6253,22 +6210,22 @@ fi elif test $krb5_impl = heimdal; then echo $ac_n "checking for main in -lkrb5""... $ac_c" 1>&6 -echo "configure:6257: checking for main in -lkrb5" >&5 -ac_lib_var=`echo krb5'_'main | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:6214: checking for main in -lkrb5" >&5 +ac_lib_var=`echo krb5'_'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 else ac_save_LIBS="$LIBS" LIBS="-lkrb5 -ldes -lasn1 -lroken -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6330,17 +6287,17 @@ if test $ol_link_krb5 = yes -a \( $ol_with_kerberos = yes -o \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6334: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:6291: 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:6344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6370,22 +6327,22 @@ done if test $ac_cv_header_kerberosIV_krb_h = yes ; then if test $krb5_impl = mit; then echo $ac_n "checking for main in -lkrb4""... $ac_c" 1>&6 -echo "configure:6374: checking for main in -lkrb4" >&5 -ac_lib_var=`echo krb4'_'main | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:6331: checking for main in -lkrb4" >&5 +ac_lib_var=`echo krb4'_'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 else ac_save_LIBS="$LIBS" LIBS="-lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6410,22 +6367,22 @@ fi elif test $krb5_impl = heimdal; then echo $ac_n "checking for main in -lkrb4""... $ac_c" 1>&6 -echo "configure:6414: checking for main in -lkrb4" >&5 -ac_lib_var=`echo krb4'_'main | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:6371: checking for main in -lkrb4" >&5 +ac_lib_var=`echo krb4'_'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 else ac_save_LIBS="$LIBS" LIBS="-lkrb4 -lkrb5 -ldes -lasn1 -lroken -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6467,15 +6424,15 @@ EOF echo $ac_n "checking for des_debug in Kerberos libraries""... $ac_c" 1>&6 -echo "configure:6471: checking for des_debug in Kerberos libraries" >&5 -if eval "test \"\${ol_cv_var_des_debug+set}\" = set"; then +echo "configure:6428: checking for des_debug in Kerberos libraries" >&5 +if eval "test \"`echo '$''{'ol_cv_var_des_debug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else save_LIBS="$LIBS" LIBS="$KRB4_LIBS $KRB5_LIBS $LIBS" cat > conftest.$ac_ext < @@ -6488,7 +6445,7 @@ des_debug = 1; ; return 0; } EOF -if { (eval echo configure:6492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_var_des_debug=yes else @@ -6527,17 +6484,17 @@ if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6531: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:6488: 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:6541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6566,22 +6523,22 @@ done if test $ac_cv_header_krb_h = yes ; then echo $ac_n "checking for main in -lkrb""... $ac_c" 1>&6 -echo "configure:6570: checking for main in -lkrb" >&5 -ac_lib_var=`echo krb'_'main | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:6527: checking for main in -lkrb" >&5 +ac_lib_var=`echo krb'_'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 else ac_save_LIBS="$LIBS" LIBS="-lkrb -ldes $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6651,17 +6608,17 @@ if test $ol_with_tls != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6655: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:6612: 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:6665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6690,15 +6647,15 @@ done if test $ac_cv_header_openssl_ssl_h = yes -o $ac_cv_header_ssl_h = yes ; then echo $ac_n "checking for SSLeay_add_ssl_algorithms in -lssl""... $ac_c" 1>&6 -echo "configure:6694: checking for SSLeay_add_ssl_algorithms in -lssl" >&5 -ac_lib_var=`echo ssl'_'SSLeay_add_ssl_algorithms | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:6651: checking for SSLeay_add_ssl_algorithms in -lssl" >&5 +ac_lib_var=`echo ssl'_'SSLeay_add_ssl_algorithms | 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="-lssl -lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6734,15 +6691,15 @@ fi if test $have_ssleay = no ; then echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6 -echo "configure:6738: checking for SSL_library_init in -lssl" >&5 -ac_lib_var=`echo ssl'_'SSL_library_init | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:6695: checking for SSL_library_init in -lssl" >&5 +ac_lib_var=`echo ssl'_'SSL_library_init | 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="-lssl -lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6779,15 +6736,15 @@ fi if test $have_ssleay = no ; then echo $ac_n "checking for ssl3_accept in -lssl""... $ac_c" 1>&6 -echo "configure:6783: checking for ssl3_accept in -lssl" >&5 -ac_lib_var=`echo ssl'_'ssl3_accept | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:6740: checking for ssl3_accept in -lssl" >&5 +ac_lib_var=`echo ssl'_'ssl3_accept | 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="-lssl -lcrypto -lRSAglue -lrsaref $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6879,12 +6836,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6883: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:6840: 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${ac_exeext}; then +if { (eval echo configure:6868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6937,19 +6893,19 @@ if test "$ac_cv_func_ctime_r" = no ; then ol_cv_func_ctime_r_nargs=0 else echo $ac_n "checking number of arguments of ctime_r""... $ac_c" 1>&6 -echo "configure:6941: checking number of arguments of ctime_r" >&5 -if eval "test \"\${ol_cv_func_ctime_r_nargs+set}\" = set"; then +echo "configure:6897: 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:6953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_ctime_r_nargs3=yes else @@ -6961,14 +6917,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { time_t ti; char *buffer; ctime_r(&ti,buffer); ; return 0; } EOF -if { (eval echo configure:6972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_ctime_r_nargs2=yes else @@ -7008,12 +6964,12 @@ fi if test "$ac_cv_func_gethostbyname_r" = yes ; then echo $ac_n "checking number of arguments of gethostbyname_r""... $ac_c" 1>&6 -echo "configure:7012: checking number of arguments of gethostbyname_r" >&5 -if eval "test \"\${ol_cv_func_gethostbyname_r_nargs+set}\" = set"; then +echo "configure:6968: checking number of arguments of gethostbyname_r" >&5 +if eval "test \"`echo '$''{'ol_cv_func_gethostbyname_r_nargs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7027,7 +6983,7 @@ struct hostent hent; char buffer[BUFSIZE]; buffer, bufsize, &h_errno); ; return 0; } EOF -if { (eval echo configure:7031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_gethostbyname_r_nargs5=yes else @@ -7039,7 +6995,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < #include @@ -7054,7 +7010,7 @@ struct hostent hent;struct hostent *rhent; &rhent, &h_errno); ; return 0; } EOF -if { (eval echo configure:7058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_gethostbyname_r_nargs6=yes else @@ -7095,12 +7051,12 @@ fi if test "$ac_cv_func_gethostbyaddr_r" = yes ; then echo $ac_n "checking number of arguments of gethostbyaddr_r""... $ac_c" 1>&6 -echo "configure:7099: checking number of arguments of gethostbyaddr_r" >&5 -if eval "test \"\${ol_cv_func_gethostbyaddr_r_nargs+set}\" = set"; then +echo "configure:7055: checking number of arguments of gethostbyaddr_r" >&5 +if eval "test \"`echo '$''{'ol_cv_func_gethostbyaddr_r_nargs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7116,7 +7072,7 @@ struct hostent hent; char buffer[BUFSIZE]; alen, AF_INET, &hent, buffer, bufsize, &h_errno); ; return 0; } EOF -if { (eval echo configure:7120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_gethostbyaddr_r_nargs7=yes else @@ -7128,7 +7084,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < #include @@ -7146,7 +7102,7 @@ struct hostent hent; &rhent, &h_errno); ; return 0; } EOF -if { (eval echo configure:7150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_gethostbyaddr_r_nargs8=yes else @@ -7209,12 +7165,12 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ echo $ac_n "checking for _beginthread""... $ac_c" 1>&6 -echo "configure:7213: checking for _beginthread" >&5 -if eval "test \"\${ac_cv_func__beginthread+set}\" = set"; then +echo "configure:7169: checking for _beginthread" >&5 +if eval "test \"`echo '$''{'ac_cv_func__beginthread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__beginthread=yes" else @@ -7293,17 +7248,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:7297: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:7252: 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:7307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7332,13 +7287,13 @@ done if test $ac_cv_header_pthread_h = yes ; then echo $ac_n "checking POSIX thread version""... $ac_c" 1>&6 -echo "configure:7336: checking POSIX thread version" >&5 -if eval "test \"\${ol_cv_pthread_version+set}\" = set"; then +echo "configure:7291: checking POSIX thread version" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -7360,7 +7315,7 @@ rm -f conftest* cat > conftest.$ac_ext < @@ -7413,12 +7368,12 @@ EOF echo $ac_n "checking for LinuxThreads pthread.h""... $ac_c" 1>&6 -echo "configure:7417: checking for LinuxThreads pthread.h" >&5 -if eval "test \"\${ol_cv_header_linux_threads+set}\" = set"; then +echo "configure:7372: checking for LinuxThreads pthread.h" >&5 +if eval "test \"`echo '$''{'ol_cv_header_linux_threads'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -7445,12 +7400,12 @@ EOF echo $ac_n "checking for GNU Pth pthread.h""... $ac_c" 1>&6 -echo "configure:7449: checking for GNU Pth pthread.h" >&5 -if eval "test \"\${ol_cv_header_gnu_pth_pthread_h+set}\" = set"; then +echo "configure:7404: checking for GNU Pth pthread.h" >&5 +if eval "test \"`echo '$''{'ol_cv_header_gnu_pth_pthread_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef _POSIX_THREAD_IS_GNU_PTH @@ -7479,17 +7434,17 @@ echo "$ac_t""$ol_cv_header_gnu_pth_pthread_h" 1>&6 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7483: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:7438: 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:7493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7519,14 +7474,14 @@ done echo $ac_n "checking for pthread_create in default libraries""... $ac_c" 1>&6 -echo "configure:7523: checking for pthread_create in default libraries" >&5 -if eval "test \"\${ol_cv_pthread_create+set}\" = set"; then +echo "configure:7478: checking for pthread_create in default libraries" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_create'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -7607,7 +7562,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_create=yes else @@ -7619,7 +7574,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -7705,7 +7660,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:7709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_create=yes else @@ -7730,8 +7685,8 @@ echo "$ac_t""$ol_cv_pthread_create" 1>&6 if test "$ol_link_threads" = no ; then # try -kthread echo $ac_n "checking for pthread link with -kthread""... $ac_c" 1>&6 -echo "configure:7734: checking for pthread link with -kthread" >&5 -if eval "test \"\${ol_cv_pthread_kthread+set}\" = set"; then +echo "configure:7689: checking for pthread link with -kthread" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_kthread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7741,7 +7696,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -7822,7 +7777,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_kthread=yes else @@ -7834,7 +7789,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -7920,7 +7875,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:7924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_kthread=yes else @@ -7950,8 +7905,8 @@ fi if test "$ol_link_threads" = no ; then # try -pthread echo $ac_n "checking for pthread link with -pthread""... $ac_c" 1>&6 -echo "configure:7954: checking for pthread link with -pthread" >&5 -if eval "test \"\${ol_cv_pthread_pthread+set}\" = set"; then +echo "configure:7909: checking for pthread link with -pthread" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_pthread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7961,7 +7916,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8042,7 +7997,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_pthread=yes else @@ -8054,7 +8009,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8140,7 +8095,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_pthread=yes else @@ -8170,8 +8125,8 @@ fi if test "$ol_link_threads" = no ; then # try -pthreads echo $ac_n "checking for pthread link with -pthreads""... $ac_c" 1>&6 -echo "configure:8174: checking for pthread link with -pthreads" >&5 -if eval "test \"\${ol_cv_pthread_pthreads+set}\" = set"; then +echo "configure:8129: checking for pthread link with -pthreads" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_pthreads'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8181,7 +8136,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8262,7 +8217,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_pthreads=yes else @@ -8274,7 +8229,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8360,7 +8315,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_pthreads=yes else @@ -8390,8 +8345,8 @@ fi if test "$ol_link_threads" = no ; then # try -mthreads echo $ac_n "checking for pthread link with -mthreads""... $ac_c" 1>&6 -echo "configure:8394: checking for pthread link with -mthreads" >&5 -if eval "test \"\${ol_cv_pthread_mthreads+set}\" = set"; then +echo "configure:8349: checking for pthread link with -mthreads" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_mthreads'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8401,7 +8356,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8482,7 +8437,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_mthreads=yes else @@ -8494,7 +8449,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8580,7 +8535,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_mthreads=yes else @@ -8610,8 +8565,8 @@ fi if test "$ol_link_threads" = no ; then # try -thread echo $ac_n "checking for pthread link with -thread""... $ac_c" 1>&6 -echo "configure:8614: checking for pthread link with -thread" >&5 -if eval "test \"\${ol_cv_pthread_thread+set}\" = set"; then +echo "configure:8569: checking for pthread link with -thread" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_thread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8621,7 +8576,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8702,7 +8657,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_thread=yes else @@ -8714,7 +8669,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8800,7 +8755,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_thread=yes else @@ -8831,8 +8786,8 @@ fi if test "$ol_link_threads" = no ; then # try -lpthread -lmach -lexc -lc_r echo $ac_n "checking for pthread link with -lpthread -lmach -lexc -lc_r""... $ac_c" 1>&6 -echo "configure:8835: checking for pthread link with -lpthread -lmach -lexc -lc_r" >&5 -if eval "test \"\${ol_cv_pthread_lpthread_lmach_lexc_lc_r+set}\" = set"; then +echo "configure:8790: checking for pthread link with -lpthread -lmach -lexc -lc_r" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_lpthread_lmach_lexc_lc_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8842,7 +8797,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8923,7 +8878,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthread_lmach_lexc_lc_r=yes else @@ -8935,7 +8890,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9021,7 +8976,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lpthread_lmach_lexc_lc_r=yes else @@ -9051,8 +9006,8 @@ fi if test "$ol_link_threads" = no ; then # try -lpthread -lmach -lexc echo $ac_n "checking for pthread link with -lpthread -lmach -lexc""... $ac_c" 1>&6 -echo "configure:9055: checking for pthread link with -lpthread -lmach -lexc" >&5 -if eval "test \"\${ol_cv_pthread_lpthread_lmach_lexc+set}\" = set"; then +echo "configure:9010: checking for pthread link with -lpthread -lmach -lexc" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_lpthread_lmach_lexc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9062,7 +9017,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -9143,7 +9098,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthread_lmach_lexc=yes else @@ -9155,7 +9110,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9241,7 +9196,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lpthread_lmach_lexc=yes else @@ -9272,8 +9227,8 @@ fi if test "$ol_link_threads" = no ; then # try -lpthread -Wl,-woff,85 echo $ac_n "checking for pthread link with -lpthread -Wl,-woff,85""... $ac_c" 1>&6 -echo "configure:9276: checking for pthread link with -lpthread -Wl,-woff,85" >&5 -if eval "test \"\${ol_cv_pthread_lib_lpthread_woff+set}\" = set"; then +echo "configure:9231: checking for pthread link with -lpthread -Wl,-woff,85" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_lib_lpthread_woff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9283,7 +9238,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -9364,7 +9319,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lib_lpthread_woff=yes else @@ -9376,7 +9331,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9462,7 +9417,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lib_lpthread_woff=yes else @@ -9493,8 +9448,8 @@ fi if test "$ol_link_threads" = no ; then # try -lpthread echo $ac_n "checking for pthread link with -lpthread""... $ac_c" 1>&6 -echo "configure:9497: checking for pthread link with -lpthread" >&5 -if eval "test \"\${ol_cv_pthread_lpthread+set}\" = set"; then +echo "configure:9452: checking for pthread link with -lpthread" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_lpthread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9504,7 +9459,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -9585,7 +9540,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthread=yes else @@ -9597,7 +9552,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9683,7 +9638,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lpthread=yes else @@ -9713,8 +9668,8 @@ fi if test "$ol_link_threads" = no ; then # try -lc_r echo $ac_n "checking for pthread link with -lc_r""... $ac_c" 1>&6 -echo "configure:9717: checking for pthread link with -lc_r" >&5 -if eval "test \"\${ol_cv_pthread_lc_r+set}\" = set"; then +echo "configure:9672: checking for pthread link with -lc_r" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_lc_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9724,7 +9679,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -9805,7 +9760,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lc_r=yes else @@ -9817,7 +9772,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9903,7 +9858,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lc_r=yes else @@ -9934,8 +9889,8 @@ fi if test "$ol_link_threads" = no ; then # try -threads echo $ac_n "checking for pthread link with -threads""... $ac_c" 1>&6 -echo "configure:9938: checking for pthread link with -threads" >&5 -if eval "test \"\${ol_cv_pthread_threads+set}\" = set"; then +echo "configure:9893: checking for pthread link with -threads" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_threads'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9945,7 +9900,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -10026,7 +9981,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_threads=yes else @@ -10038,7 +9993,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -10124,7 +10079,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:10128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_threads=yes else @@ -10155,8 +10110,8 @@ fi if test "$ol_link_threads" = no ; then # try -lpthreads -lmach -lexc -lc_r echo $ac_n "checking for pthread link with -lpthreads -lmach -lexc -lc_r""... $ac_c" 1>&6 -echo "configure:10159: checking for pthread link with -lpthreads -lmach -lexc -lc_r" >&5 -if eval "test \"\${ol_cv_pthread_lpthreads_lmach_lexc_lc_r+set}\" = set"; then +echo "configure:10114: checking for pthread link with -lpthreads -lmach -lexc -lc_r" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_lpthreads_lmach_lexc_lc_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10166,7 +10121,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -10247,7 +10202,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthreads_lmach_lexc_lc_r=yes else @@ -10259,7 +10214,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -10345,7 +10300,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:10349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lpthreads_lmach_lexc_lc_r=yes else @@ -10375,8 +10330,8 @@ fi if test "$ol_link_threads" = no ; then # try -lpthreads -lmach -lexc echo $ac_n "checking for pthread link with -lpthreads -lmach -lexc""... $ac_c" 1>&6 -echo "configure:10379: checking for pthread link with -lpthreads -lmach -lexc" >&5 -if eval "test \"\${ol_cv_pthread_lpthreads_lmach_lexc+set}\" = set"; then +echo "configure:10334: checking for pthread link with -lpthreads -lmach -lexc" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_lpthreads_lmach_lexc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10386,7 +10341,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -10467,7 +10422,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthreads_lmach_lexc=yes else @@ -10479,7 +10434,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -10565,7 +10520,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:10569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lpthreads_lmach_lexc=yes else @@ -10595,8 +10550,8 @@ fi if test "$ol_link_threads" = no ; then # try -lpthreads -lexc echo $ac_n "checking for pthread link with -lpthreads -lexc""... $ac_c" 1>&6 -echo "configure:10599: checking for pthread link with -lpthreads -lexc" >&5 -if eval "test \"\${ol_cv_pthread_lpthreads_lexc+set}\" = set"; then +echo "configure:10554: checking for pthread link with -lpthreads -lexc" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_lpthreads_lexc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10606,7 +10561,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -10687,7 +10642,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthreads_lexc=yes else @@ -10699,7 +10654,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -10785,7 +10740,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:10789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lpthreads_lexc=yes else @@ -10816,8 +10771,8 @@ fi if test "$ol_link_threads" = no ; then # try -lpthreads echo $ac_n "checking for pthread link with -lpthreads""... $ac_c" 1>&6 -echo "configure:10820: checking for pthread link with -lpthreads" >&5 -if eval "test \"\${ol_cv_pthread_lib_lpthreads+set}\" = set"; then +echo "configure:10775: checking for pthread link with -lpthreads" >&5 +if eval "test \"`echo '$''{'ol_cv_pthread_lib_lpthreads'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10827,7 +10782,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -10908,7 +10863,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lib_lpthreads=yes else @@ -10920,7 +10875,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -11006,7 +10961,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:11010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_lib_lpthreads=yes else @@ -11048,12 +11003,12 @@ EOF for ac_func in sched_yield pthread_yield do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11052: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:11007: 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${ac_exeext}; then +if { (eval echo configure:11035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11105,15 +11059,15 @@ 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:11109: checking for sched_yield in -lrt" >&5 -ac_lib_var=`echo rt'_'sched_yield | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:11063: 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 else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11156,12 +11110,12 @@ fi for ac_func in thr_yield do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11160: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:11114: 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${ac_exeext}; then +if { (eval echo configure:11142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11219,12 +11172,12 @@ done for ac_func in pthread_kill pthread_rwlock_destroy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11223: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:11176: 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${ac_exeext}; then +if { (eval echo configure:11204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11274,13 +11226,13 @@ done echo $ac_n "checking for pthread_detach with ""... $ac_c" 1>&6 -echo "configure:11278: checking for pthread_detach with " >&5 -if eval "test \"\${ol_cv_func_pthread_detach+set}\" = set"; then +echo "configure:11230: checking for pthread_detach with " >&5 +if eval "test \"`echo '$''{'ol_cv_func_pthread_detach'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -11292,7 +11244,7 @@ int main() { pthread_detach(NULL); ; return 0; } EOF -if { (eval echo configure:11296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_func_pthread_detach=yes else @@ -11324,12 +11276,12 @@ EOF do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11328: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:11280: 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${ac_exeext}; then +if { (eval echo configure:11308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11382,12 +11333,12 @@ done for ac_func in pthread_kill_other_threads_np do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11386: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:11337: 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${ac_exeext}; then +if { (eval echo configure:11365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11436,8 +11386,8 @@ fi done echo $ac_n "checking for LinuxThreads implementation""... $ac_c" 1>&6 -echo "configure:11440: checking for LinuxThreads implementation" >&5 -if eval "test \"\${ol_cv_sys_linux_threads+set}\" = set"; then +echo "configure:11390: checking for LinuxThreads implementation" >&5 +if eval "test \"`echo '$''{'ol_cv_sys_linux_threads'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ol_cv_sys_linux_threads=$ac_cv_func_pthread_kill_other_threads_np @@ -11449,8 +11399,8 @@ echo "$ac_t""$ol_cv_sys_linux_threads" 1>&6 echo $ac_n "checking for LinuxThreads consistency""... $ac_c" 1>&6 -echo "configure:11453: checking for LinuxThreads consistency" >&5 -if eval "test \"\${ol_cv_linux_threads+set}\" = set"; then +echo "configure:11403: checking for LinuxThreads consistency" >&5 +if eval "test \"`echo '$''{'ol_cv_linux_threads'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11474,8 +11424,8 @@ echo "$ac_t""$ol_cv_linux_threads" 1>&6 fi echo $ac_n "checking if pthread_create() works""... $ac_c" 1>&6 -echo "configure:11478: checking if pthread_create() works" >&5 -if eval "test \"\${ol_cv_pthread_create_works+set}\" = set"; then +echo "configure:11428: 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 @@ -11483,7 +11433,7 @@ else ol_cv_pthread_create_works=yes else cat > conftest.$ac_ext < @@ -11569,7 +11519,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:11573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_create_works=yes else @@ -11591,8 +11541,8 @@ echo "$ac_t""$ol_cv_pthread_create_works" 1>&6 if test $ol_with_yielding_select = auto ; then echo $ac_n "checking if select yields when using pthreads""... $ac_c" 1>&6 -echo "configure:11595: checking if select yields when using pthreads" >&5 -if eval "test \"\${ol_cv_pthread_select_yields+set}\" = set"; then +echo "configure:11545: 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 @@ -11600,7 +11550,7 @@ else ol_cv_pthread_select_yields=cross else cat > conftest.$ac_ext < @@ -11676,7 +11626,7 @@ int main(argc, argv) exit(2); } EOF -if { (eval echo configure:11680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_pthread_select_yields=no else @@ -11720,17 +11670,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:11724: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:11674: 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:11734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11760,12 +11710,12 @@ done ol_with_threads=found echo $ac_n "checking for cthread_fork""... $ac_c" 1>&6 -echo "configure:11764: checking for cthread_fork" >&5 -if eval "test \"\${ac_cv_func_cthread_fork+set}\" = set"; then +echo "configure:11714: 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${ac_exeext}; then +if { (eval echo configure:11742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_cthread_fork=yes" else @@ -11811,15 +11760,15 @@ fi if test $ol_link_threads = no ; then echo $ac_n "checking for cthread_fork with -all_load""... $ac_c" 1>&6 -echo "configure:11815: checking for cthread_fork with -all_load" >&5 -if eval "test \"\${ol_cv_cthread_all_load+set}\" = set"; then +echo "configure:11764: 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 save_LIBS="$LIBS" LIBS="-all_load $LIBS" cat > conftest.$ac_ext < int main() { @@ -11828,7 +11777,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_cthread_all_load=yes else @@ -11873,17 +11822,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:11877: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:11826: 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:11887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11912,15 +11861,15 @@ done if test $ac_cv_header_pth_h = yes ; then echo $ac_n "checking for pth_version in -lpth""... $ac_c" 1>&6 -echo "configure:11916: checking for pth_version in -lpth" >&5 -ac_lib_var=`echo pth'_'pth_version | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:11865: checking for pth_version in -lpth" >&5 +ac_lib_var=`echo pth'_'pth_version | 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="-lpth $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11975,17 +11924,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:11979: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:11928: 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:11989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12013,15 +11962,15 @@ 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:12017: checking for thr_create in -lthread" >&5 -ac_lib_var=`echo thread'_'thr_create | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:11966: 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 else ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12072,12 +12021,12 @@ EOF do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12076: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:12025: 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${ac_exeext}; then +if { (eval echo configure:12053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12132,17 +12080,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12136: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:12084: 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:12146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12170,15 +12118,15 @@ 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:12174: checking for lwp_create in -llwp" >&5 -ac_lib_var=`echo lwp'_'lwp_create | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:12122: 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 else ac_save_LIBS="$LIBS" LIBS="-llwp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12242,17 +12190,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:12246: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:12194: 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:12256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12281,12 +12229,12 @@ done for ac_func in sched_yield pthread_yield do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12285: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:12233: 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${ac_exeext}; then +if { (eval echo configure:12261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12336,12 +12283,12 @@ done echo $ac_n "checking for LinuxThreads pthread.h""... $ac_c" 1>&6 -echo "configure:12340: checking for LinuxThreads pthread.h" >&5 -if eval "test \"\${ol_cv_header_linux_threads+set}\" = set"; then +echo "configure:12287: checking for LinuxThreads pthread.h" >&5 +if eval "test \"`echo '$''{'ol_cv_header_linux_threads'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -12371,17 +12318,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12375: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:12322: 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:12385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12411,17 +12358,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12415: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:12362: 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:12425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12451,17 +12398,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12455: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:12402: 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:12465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12520,20 +12467,20 @@ EOF echo $ac_n "checking for thread specific errno""... $ac_c" 1>&6 -echo "configure:12524: checking for thread specific errno" >&5 -if eval "test \"\${ol_cv_errno_thread_specific+set}\" = set"; then +echo "configure:12471: 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 < int main() { errno = 0; ; return 0; } EOF -if { (eval echo configure:12537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_errno_thread_specific=yes else @@ -12549,20 +12496,20 @@ fi echo "$ac_t""$ol_cv_errno_thread_specific" 1>&6 echo $ac_n "checking for thread specific h_errno""... $ac_c" 1>&6 -echo "configure:12553: checking for thread specific h_errno" >&5 -if eval "test \"\${ol_cv_h_errno_thread_specific+set}\" = set"; then +echo "configure:12500: checking for thread specific h_errno" >&5 +if eval "test \"`echo '$''{'ol_cv_h_errno_thread_specific'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { h_errno = 0; ; return 0; } EOF -if { (eval echo configure:12566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_h_errno_thread_specific=yes else @@ -12621,17 +12568,17 @@ for ac_hdr in db_185.h db.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12625: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:12572: 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:12635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12659,13 +12606,13 @@ done if test $ac_cv_header_db_185_h = yes -o $ac_cv_header_db_h = yes; then echo $ac_n "checking if Berkeley DB header compatibility""... $ac_c" 1>&6 -echo "configure:12663: checking if Berkeley DB header compatibility" >&5 -if eval "test \"\${ol_cv_header_db1+set}\" = set"; then +echo "configure:12610: checking if Berkeley DB header compatibility" >&5 +if eval "test \"`echo '$''{'ol_cv_header_db1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ol_cv_lib_db=no if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (default)""... $ac_c" 1>&6 -echo "configure:12706: checking for Berkeley DB link (default)" >&5 -if eval "test \"\${ol_cv_db_none+set}\" = set"; then +echo "configure:12653: checking for Berkeley DB link (default)" >&5 +if eval "test \"`echo '$''{'ol_cv_db_none'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12712,7 +12659,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_none=yes else @@ -12783,8 +12730,8 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb)""... $ac_c" 1>&6 -echo "configure:12787: checking for Berkeley DB link (-ldb)" >&5 -if eval "test \"\${ol_cv_db_db+set}\" = set"; then +echo "configure:12734: checking for Berkeley DB link (-ldb)" >&5 +if eval "test \"`echo '$''{'ol_cv_db_db'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12793,7 +12740,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db=yes else @@ -12864,8 +12811,8 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb3)""... $ac_c" 1>&6 -echo "configure:12868: checking for Berkeley DB link (-ldb3)" >&5 -if eval "test \"\${ol_cv_db_db3+set}\" = set"; then +echo "configure:12815: checking for Berkeley DB link (-ldb3)" >&5 +if eval "test \"`echo '$''{'ol_cv_db_db3'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12874,7 +12821,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db3=yes else @@ -12945,8 +12892,8 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb2)""... $ac_c" 1>&6 -echo "configure:12949: checking for Berkeley DB link (-ldb2)" >&5 -if eval "test \"\${ol_cv_db_db2+set}\" = set"; then +echo "configure:12896: checking for Berkeley DB link (-ldb2)" >&5 +if eval "test \"`echo '$''{'ol_cv_db_db2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12955,7 +12902,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db2=yes else @@ -13026,8 +12973,8 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb1)""... $ac_c" 1>&6 -echo "configure:13030: checking for Berkeley DB link (-ldb1)" >&5 -if eval "test \"\${ol_cv_db_db1+set}\" = set"; then +echo "configure:12977: checking for Berkeley DB link (-ldb1)" >&5 +if eval "test \"`echo '$''{'ol_cv_db_db1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13036,7 +12983,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db1=yes else @@ -13118,17 +13065,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:13122: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:13069: 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:13132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13158,8 +13105,8 @@ if test $ac_cv_header_db_h = yes; then ol_cv_lib_db=no if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (default)""... $ac_c" 1>&6 -echo "configure:13162: checking for Berkeley DB link (default)" >&5 -if eval "test \"\${ol_cv_db_none+set}\" = set"; then +echo "configure:13109: checking for Berkeley DB link (default)" >&5 +if eval "test \"`echo '$''{'ol_cv_db_none'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13168,7 +13115,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_none=yes else @@ -13239,8 +13186,8 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb)""... $ac_c" 1>&6 -echo "configure:13243: checking for Berkeley DB link (-ldb)" >&5 -if eval "test \"\${ol_cv_db_db+set}\" = set"; then +echo "configure:13190: checking for Berkeley DB link (-ldb)" >&5 +if eval "test \"`echo '$''{'ol_cv_db_db'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13249,7 +13196,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db=yes else @@ -13320,8 +13267,8 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb3)""... $ac_c" 1>&6 -echo "configure:13324: checking for Berkeley DB link (-ldb3)" >&5 -if eval "test \"\${ol_cv_db_db3+set}\" = set"; then +echo "configure:13271: checking for Berkeley DB link (-ldb3)" >&5 +if eval "test \"`echo '$''{'ol_cv_db_db3'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13330,7 +13277,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db3=yes else @@ -13401,8 +13348,8 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb2)""... $ac_c" 1>&6 -echo "configure:13405: checking for Berkeley DB link (-ldb2)" >&5 -if eval "test \"\${ol_cv_db_db2+set}\" = set"; then +echo "configure:13352: checking for Berkeley DB link (-ldb2)" >&5 +if eval "test \"`echo '$''{'ol_cv_db_db2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13411,7 +13358,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db2=yes else @@ -13482,8 +13429,8 @@ fi if test $ol_cv_lib_db = no ; then echo $ac_n "checking for Berkeley DB link (-ldb1)""... $ac_c" 1>&6 -echo "configure:13486: checking for Berkeley DB link (-ldb1)" >&5 -if eval "test \"\${ol_cv_db_db1+set}\" = set"; then +echo "configure:13433: checking for Berkeley DB link (-ldb1)" >&5 +if eval "test \"`echo '$''{'ol_cv_db_db1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13492,7 +13439,7 @@ else LIBS="$ol_DB_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_db_db1=yes else @@ -13565,8 +13512,8 @@ fi if test "$ol_cv_lib_db" != no ; then ol_cv_berkeley_db=yes echo $ac_n "checking for Berkeley DB thread support""... $ac_c" 1>&6 -echo "configure:13569: checking for Berkeley DB thread support" >&5 -if eval "test \"\${ol_cv_berkeley_db_thread+set}\" = set"; then +echo "configure:13516: checking for Berkeley DB thread support" >&5 +if eval "test \"`echo '$''{'ol_cv_berkeley_db_thread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13579,7 +13526,7 @@ else ol_cv_berkeley_db_thread=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_berkeley_db_thread=yes else @@ -13717,18 +13664,18 @@ fi if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = mdbm ; then echo $ac_n "checking for MDBM library""... $ac_c" 1>&6 -echo "configure:13721: checking for MDBM library" >&5 -if eval "test \"\${ol_cv_lib_mdbm+set}\" = set"; then +echo "configure:13668: checking for MDBM library" >&5 +if eval "test \"`echo '$''{'ol_cv_lib_mdbm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ol_LIBS="$LIBS" echo $ac_n "checking for mdbm_set_chain""... $ac_c" 1>&6 -echo "configure:13727: checking for mdbm_set_chain" >&5 -if eval "test \"\${ac_cv_func_mdbm_set_chain+set}\" = set"; then +echo "configure:13674: checking for mdbm_set_chain" >&5 +if eval "test \"`echo '$''{'ac_cv_func_mdbm_set_chain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_mdbm_set_chain=yes" else @@ -13771,15 +13717,15 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for mdbm_set_chain in -lmdbm""... $ac_c" 1>&6 -echo "configure:13775: checking for mdbm_set_chain in -lmdbm" >&5 -ac_lib_var=`echo mdbm'_'mdbm_set_chain | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:13721: checking for mdbm_set_chain in -lmdbm" >&5 +ac_lib_var=`echo mdbm'_'mdbm_set_chain | 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="-lmdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13825,17 +13771,17 @@ echo "$ac_t""$ol_cv_lib_mdbm" 1>&6 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13829: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:13775: 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:13839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13862,8 +13808,8 @@ fi done echo $ac_n "checking for db""... $ac_c" 1>&6 -echo "configure:13866: checking for db" >&5 -if eval "test \"\${ol_cv_mdbm+set}\" = set"; then +echo "configure:13812: checking for db" >&5 +if eval "test \"`echo '$''{'ol_cv_mdbm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13895,18 +13841,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:13899: checking for GDBM library" >&5 -if eval "test \"\${ol_cv_lib_gdbm+set}\" = set"; then +echo "configure:13845: 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:13905: checking for gdbm_open" >&5 -if eval "test \"\${ac_cv_func_gdbm_open+set}\" = set"; then +echo "configure:13851: 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${ac_exeext}; then +if { (eval echo configure:13879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gdbm_open=yes" else @@ -13949,15 +13894,15 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:13953: checking for gdbm_open in -lgdbm" >&5 -ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:13898: 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 else ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14003,17 +13948,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:14007: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:13952: 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:14017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14040,8 +13985,8 @@ fi done echo $ac_n "checking for db""... $ac_c" 1>&6 -echo "configure:14044: checking for db" >&5 -if eval "test \"\${ol_cv_gdbm+set}\" = set"; then +echo "configure:13989: checking for db" >&5 +if eval "test \"`echo '$''{'ol_cv_gdbm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14074,18 +14019,18 @@ fi if test $ol_with_ldbm_api = ndbm ; then echo $ac_n "checking for NDBM library""... $ac_c" 1>&6 -echo "configure:14078: checking for NDBM library" >&5 -if eval "test \"\${ol_cv_lib_ndbm+set}\" = set"; then +echo "configure:14023: 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:14084: checking for dbm_open" >&5 -if eval "test \"\${ac_cv_func_dbm_open+set}\" = set"; then +echo "configure:14029: 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${ac_exeext}; then +if { (eval echo configure:14057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -14128,15 +14072,15 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6 -echo "configure:14132: checking for dbm_open in -lndbm" >&5 -ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:14076: 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 else ac_save_LIBS="$LIBS" LIBS="-lndbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14167,15 +14111,15 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:14171: checking for dbm_open in -ldbm" >&5 -ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:14115: 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 else ac_save_LIBS="$LIBS" LIBS="-ldbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14223,17 +14167,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:14227: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:14171: 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:14237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14260,8 +14204,8 @@ fi done echo $ac_n "checking for db""... $ac_c" 1>&6 -echo "configure:14264: checking for db" >&5 -if eval "test \"\${ol_cv_ndbm+set}\" = set"; then +echo "configure:14208: checking for db" >&5 +if eval "test \"`echo '$''{'ol_cv_ndbm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14313,17 +14257,17 @@ if test $ol_enable_wrappers != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:14317: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:14261: 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:14327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14354,7 +14298,7 @@ done have_wrappers=no else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_wrappers=yes else @@ -14384,22 +14328,22 @@ EOF WRAP_LIBS="-lwrap" echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:14388: checking for main in -lnsl" >&5 -ac_lib_var=`echo nsl'_'main | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:14332: checking for main in -lnsl" >&5 +ac_lib_var=`echo nsl'_'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 else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14440,12 +14384,12 @@ fi if test $ol_enable_syslog != no ; then echo $ac_n "checking for openlog""... $ac_c" 1>&6 -echo "configure:14444: checking for openlog" >&5 -if eval "test \"\${ac_cv_func_openlog+set}\" = set"; then +echo "configure:14388: 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${ac_exeext}; then +if { (eval echo configure:14416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_openlog=yes" else @@ -14498,15 +14441,15 @@ fi ol_link_sql=no if test $ol_enable_sql != no ; then echo $ac_n "checking for SQLDriverConnect in -liodbc""... $ac_c" 1>&6 -echo "configure:14502: checking for SQLDriverConnect in -liodbc" >&5 -ac_lib_var=`echo iodbc'_'SQLDriverConnect | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:14445: checking for SQLDriverConnect in -liodbc" >&5 +ac_lib_var=`echo iodbc'_'SQLDriverConnect | 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="-liodbc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14542,15 +14485,15 @@ fi ol_link_sql="-liodbc" else echo $ac_n "checking for SQLDriverConnect in -lodbc""... $ac_c" 1>&6 -echo "configure:14546: checking for SQLDriverConnect in -lodbc" >&5 -ac_lib_var=`echo odbc'_'SQLDriverConnect | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:14489: checking for SQLDriverConnect in -lodbc" >&5 +ac_lib_var=`echo odbc'_'SQLDriverConnect | 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="-lodbc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14600,17 +14543,17 @@ if test $ol_enable_tcl != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:14604: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:14547: 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:14614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14642,22 +14585,22 @@ done else for lib in tcl tcl7.6 tcl8.0 tcl8.2 ; do echo $ac_n "checking for main in -l$lib""... $ac_c" 1>&6 -echo "configure:14646: checking for main in -l$lib" >&5 -ac_lib_var=`echo $lib'_'main | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:14589: checking for main in -l$lib" >&5 +ac_lib_var=`echo $lib'_'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 else ac_save_LIBS="$LIBS" LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14701,17 +14644,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:14705: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:14648: 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:14715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14740,15 +14683,15 @@ done if test $ol_link_termcap = no ; then echo $ac_n "checking for tputs in -ltermcap""... $ac_c" 1>&6 -echo "configure:14744: checking for tputs in -ltermcap" >&5 -ac_lib_var=`echo termcap'_'tputs | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:14687: 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 else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14792,15 +14735,15 @@ fi if test $ol_link_termcap = no ; then echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:14796: checking for initscr in -lncurses" >&5 -ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:14739: 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 else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14857,17 +14800,17 @@ if test $ol_with_cyrus_sasl != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:14861: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:14804: 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:14871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14896,15 +14839,15 @@ done if test $ac_cv_header_sasl_h = yes ; then echo $ac_n "checking for sasl_client_init in -lsasl""... $ac_c" 1>&6 -echo "configure:14900: checking for sasl_client_init in -lsasl" >&5 -ac_lib_var=`echo sasl'_'sasl_client_init | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:14843: checking for sasl_client_init in -lsasl" >&5 +ac_lib_var=`echo sasl'_'sasl_client_init | 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="-lsasl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14996,13 +14939,13 @@ if test $ol_with_fetch != no ; then ol_LIBS=$LIBS LIBS="-lfetch -lcom_err $LIBS" echo $ac_n "checking fetch(3) library""... $ac_c" 1>&6 -echo "configure:15000: checking fetch(3) library" >&5 -if eval "test \"\${ol_cv_lib_fetch+set}\" = set"; then +echo "configure:14943: checking fetch(3) library" >&5 +if eval "test \"`echo '$''{'ol_cv_lib_fetch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -15012,7 +14955,7 @@ int main() { struct url *u = fetchParseURL("file:///"); ; return 0; } EOF -if { (eval echo configure:15016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_lib_fetch=yes else @@ -15050,17 +14993,17 @@ if test $ol_with_readline != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:15054: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:14997: 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:15064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -15091,15 +15034,15 @@ done save_LIBS="$LIBS" LIBS="$TERMCAP_LIBS $LIBS" echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:15095: checking for readline in -lreadline" >&5 -ac_lib_var=`echo readline'_'readline | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:15038: checking for readline in -lreadline" >&5 +ac_lib_var=`echo readline'_'readline | 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="-lreadline $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15152,12 +15095,12 @@ fi if test $ol_enable_crypt != no ; then echo $ac_n "checking for crypt""... $ac_c" 1>&6 -echo "configure:15156: checking for crypt" >&5 -if eval "test \"\${ac_cv_func_crypt+set}\" = set"; then +echo "configure:15099: 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${ac_exeext}; then +if { (eval echo configure:15127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_crypt=yes" else @@ -15200,15 +15142,15 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:15204: checking for crypt in -lcrypt" >&5 -ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:15146: 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 else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15262,12 +15204,12 @@ fi if test $ol_enable_proctitle != no ; then echo $ac_n "checking for setproctitle""... $ac_c" 1>&6 -echo "configure:15266: checking for setproctitle" >&5 -if eval "test \"\${ac_cv_func_setproctitle+set}\" = set"; then +echo "configure:15208: 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${ac_exeext}; then +if { (eval echo configure:15236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setproctitle=yes" else @@ -15310,15 +15251,15 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6 -echo "configure:15314: checking for setproctitle in -lutil" >&5 -ac_lib_var=`echo util'_'setproctitle | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:15255: 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 else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15369,17 +15310,17 @@ if test $ol_enable_slp != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:15373: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:15314: 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:15383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -15408,15 +15349,15 @@ done if test $ac_cv_header_slp_h = yes ; then echo $ac_n "checking for SLPOpen in -lslp""... $ac_c" 1>&6 -echo "configure:15412: checking for SLPOpen in -lslp" >&5 -ac_lib_var=`echo slp'_'SLPOpen | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:15353: checking for SLPOpen in -lslp" >&5 +ac_lib_var=`echo slp'_'SLPOpen | 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="-lslp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15462,12 +15403,12 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:15466: checking for ANSI C header files" >&5 -if eval "test \"\${ac_cv_header_stdc+set}\" = set"; then +echo "configure:15407: 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 @@ -15475,7 +15416,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -15492,7 +15433,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 @@ -15510,7 +15451,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 @@ -15531,25 +15472,18 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < -#if ((' ' & 0x0FF) == 0x020) #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -#define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -#define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int main () { int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:15553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:15487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -15573,127 +15507,118 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:15577: checking for mode_t" >&5 -if eval "test \"\${ac_cv_type_mode_t+set}\" = set"; then +echo "configure:15511: 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 #include #include #endif - EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_type_mode_t=yes" + ac_cv_type_mode_t=yes else rm -rf conftest* - eval "ac_cv_type_mode_t=no" + ac_cv_type_mode_t=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_type_'mode_t`\" = yes"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <&6 +if test $ac_cv_type_mode_t = no; then + cat >> confdefs.h <<\EOF #define mode_t int EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:15613: checking for off_t" >&5 -if eval "test \"\${ac_cv_type_off_t+set}\" = set"; then +echo "configure:15544: 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 #include #include #endif - EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_type_off_t=yes" + ac_cv_type_off_t=yes else rm -rf conftest* - eval "ac_cv_type_off_t=no" + ac_cv_type_off_t=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_type_'off_t`\" = yes"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <&6 +if test $ac_cv_type_off_t = no; then + cat >> confdefs.h <<\EOF #define off_t long EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:15649: checking for pid_t" >&5 -if eval "test \"\${ac_cv_type_pid_t+set}\" = set"; then +echo "configure:15577: 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 #include #include #endif - EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_type_pid_t=yes" + ac_cv_type_pid_t=yes else rm -rf conftest* - eval "ac_cv_type_pid_t=no" + ac_cv_type_pid_t=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_type_'pid_t`\" = yes"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <&6 +if test $ac_cv_type_pid_t = no; then + cat >> confdefs.h <<\EOF #define pid_t int EOF fi echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6 -echo "configure:15685: checking for ptrdiff_t" >&5 -if eval "test \"\${am_cv_type_ptrdiff_t+set}\" = set"; then +echo "configure:15610: 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:15697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_type_ptrdiff_t=yes else @@ -15714,12 +15639,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:15718: checking return type of signal handlers" >&5 -if eval "test \"\${ac_cv_type_signal+set}\" = set"; then +echo "configure:15643: 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 @@ -15736,7 +15661,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:15740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -15755,36 +15680,33 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:15759: checking for size_t" >&5 -if eval "test \"\${ac_cv_type_size_t+set}\" = set"; then +echo "configure:15684: 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 #include #include #endif - EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_type_size_t=yes" + ac_cv_type_size_t=yes else rm -rf conftest* - eval "ac_cv_type_size_t=no" + ac_cv_type_size_t=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_type_'size_t`\" = yes"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <&6 +if test $ac_cv_type_size_t = no; then + cat >> confdefs.h <<\EOF #define size_t unsigned EOF @@ -15792,72 +15714,66 @@ fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:15796: checking for ssize_t" >&5 -if eval "test \"\${ac_cv_type_ssize_t+set}\" = set"; then +echo "configure:15718: checking for ssize_t" >&5 +if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS #include #include #endif - EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_type_ssize_t=yes" + ac_cv_type_ssize_t=yes else rm -rf conftest* - eval "ac_cv_type_ssize_t=no" + ac_cv_type_ssize_t=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_type_'ssize_t`\" = yes"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <&6 +if test $ac_cv_type_ssize_t = no; then + cat >> confdefs.h <<\EOF #define ssize_t signed int EOF fi echo $ac_n "checking for caddr_t""... $ac_c" 1>&6 -echo "configure:15832: checking for caddr_t" >&5 -if eval "test \"\${ac_cv_type_caddr_t+set}\" = set"; then +echo "configure:15751: checking for caddr_t" >&5 +if eval "test \"`echo '$''{'ac_cv_type_caddr_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS #include #include #endif - EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])caddr_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_type_caddr_t=yes" + ac_cv_type_caddr_t=yes else rm -rf conftest* - eval "ac_cv_type_caddr_t=no" + ac_cv_type_caddr_t=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_type_'caddr_t`\" = yes"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <&6 +if test $ac_cv_type_caddr_t = no; then + cat >> confdefs.h <<\EOF #define caddr_t char * EOF @@ -15865,12 +15781,12 @@ fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:15869: checking for socklen_t" >&5 -if eval "test \"\${ol_cv_type_socklen_t+set}\" = set"; then +echo "configure:15785: checking for socklen_t" >&5 +if eval "test \"`echo '$''{'ol_cv_type_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_type_socklen_t=yes else @@ -15904,35 +15820,34 @@ EOF fi -echo $ac_n "checking for member st_blksize in aggregate type struct stat""... $ac_c" 1>&6 -echo "configure:15909: checking for member st_blksize in aggregate type struct stat" >&5 -if eval "test \"\${ac_cv_c_struct_member_st_blksize+set}\" = set"; then +echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 +echo "configure:15825: 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 int main() { -struct stat foo; foo.st_blksize; +struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:15922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_cv_c_struct_member_st_blksize=yes + ac_cv_struct_st_blksize=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_c_struct_member_st_blksize=no + ac_cv_struct_st_blksize=no fi rm -f conftest* fi -echo "$ac_t""$ac_cv_c_struct_member_st_blksize" 1>&6 -st_blksize="$ac_cv_c_struct_member_st_blksize" -if test $ac_cv_c_struct_member_st_blksize = yes; then +echo "$ac_t""$ac_cv_struct_st_blksize" 1>&6 +if test $ac_cv_struct_st_blksize = yes; then cat >> confdefs.h <<\EOF #define HAVE_ST_BLKSIZE 1 EOF @@ -15940,12 +15855,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:15944: checking whether time.h and sys/time.h may both be included" >&5 -if eval "test \"\${ac_cv_header_time+set}\" = set"; then +echo "configure:15859: 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 @@ -15954,7 +15869,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:15958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -15975,12 +15890,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:15979: checking whether struct tm is in sys/time.h or time.h" >&5 -if eval "test \"\${ac_cv_struct_tm+set}\" = set"; then +echo "configure:15894: 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 @@ -15988,7 +15903,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:15992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -16009,12 +15924,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:16013: checking for uid_t in sys/types.h" >&5 -if eval "test \"\${ac_cv_type_uid_t+set}\" = set"; then +echo "configure:15928: 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 @@ -16043,19 +15958,19 @@ EOF fi echo $ac_n "checking for sig_atomic_t""... $ac_c" 1>&6 -echo "configure:16047: checking for sig_atomic_t" >&5 -if eval "test \"\${ol_cv_type_sig_atomic_t+set}\" = set"; then +echo "configure:15962: 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:16059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_type_sig_atomic_t=yes else @@ -16079,13 +15994,13 @@ EOF # test for pw_gecos in struct passwd echo $ac_n "checking struct passwd for pw_gecos""... $ac_c" 1>&6 -echo "configure:16083: checking struct passwd for pw_gecos" >&5 -if eval "test \"\${ol_cv_struct_passwd_pw_gecos+set}\" = set"; then +echo "configure:15998: checking struct passwd for pw_gecos" >&5 +if eval "test \"`echo '$''{'ol_cv_struct_passwd_pw_gecos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -16095,7 +16010,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_struct_passwd_pw_gecos=yes else @@ -16117,13 +16032,13 @@ fi # test for pw_passwd in struct passwd echo $ac_n "checking struct passwd for pw_passwd""... $ac_c" 1>&6 -echo "configure:16121: checking struct passwd for pw_passwd" >&5 -if eval "test \"\${ol_cv_struct_passwd_pw_passwd+set}\" = set"; then +echo "configure:16036: checking struct passwd for pw_passwd" >&5 +if eval "test \"`echo '$''{'ol_cv_struct_passwd_pw_passwd'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -16133,7 +16048,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_struct_passwd_pw_passwd=yes else @@ -16155,8 +16070,8 @@ fi echo $ac_n "checking if toupper() requires islower()""... $ac_c" 1>&6 -echo "configure:16159: checking if toupper() requires islower()" >&5 -if eval "test \"\${ol_cv_c_upper_lower+set}\" = set"; then +echo "configure:16074: 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 @@ -16164,7 +16079,7 @@ else ol_cv_c_upper_lower=safe else cat > conftest.$ac_ext < @@ -16176,7 +16091,7 @@ main() exit(1); } EOF -if { (eval echo configure:16180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_c_upper_lower=no else @@ -16199,12 +16114,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:16203: checking for working const" >&5 -if eval "test \"\${ac_cv_c_const+set}\" = set"; then +echo "configure:16118: 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:16172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -16274,12 +16189,12 @@ EOF fi echo $ac_n "checking if compiler understands volatile""... $ac_c" 1>&6 -echo "configure:16278: checking if compiler understands volatile" >&5 -if eval "test \"\${ol_cv_c_volatile+set}\" = set"; then +echo "configure:16193: 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:16207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_c_volatile=yes else @@ -16318,14 +16233,14 @@ EOF else echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:16322: checking whether byte ordering is bigendian" >&5 -if eval "test \"\${ac_cv_c_bigendian+set}\" = set"; then +echo "configure:16237: 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 @@ -16336,11 +16251,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:16340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16255: \"$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 @@ -16351,7 +16266,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:16355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -16371,7 +16286,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -16410,13 +16325,13 @@ fi fi echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:16414: checking size of short" >&5 -if eval "test \"\${ac_cv_sizeof_short+set}\" = set"; then +echo "configure:16329: 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 for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -16426,7 +16341,7 @@ int main() { switch (0) case 0: case (sizeof (short) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:16430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_short=$ac_size else @@ -16449,13 +16364,13 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:16453: checking size of int" >&5 -if eval "test \"\${ac_cv_sizeof_int+set}\" = set"; then +echo "configure:16368: 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 for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -16465,7 +16380,7 @@ int main() { switch (0) case 0: case (sizeof (int) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:16469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_int=$ac_size else @@ -16488,13 +16403,13 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:16492: checking size of long" >&5 -if eval "test \"\${ac_cv_sizeof_long+set}\" = set"; then +echo "configure:16407: 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 for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -16504,7 +16419,7 @@ int main() { switch (0) case 0: case (sizeof (long) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:16508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_long=$ac_size else @@ -16555,15 +16470,15 @@ EOF echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:16559: checking for 8-bit clean memcmp" >&5 -if eval "test \"\${ac_cv_func_memcmp_clean+set}\" = set"; then +echo "configure:16474: 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 if test "$cross_compiling" = yes; then ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -16591,12 +16506,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:16595: checking for strftime" >&5 -if eval "test \"\${ac_cv_func_strftime+set}\" = set"; then +echo "configure:16510: 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${ac_exeext}; then +if { (eval echo configure:16538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -16642,15 +16556,15 @@ 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:16646: checking for strftime in -lintl" >&5 -ac_lib_var=`echo intl'_'strftime | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:16560: 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 else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16689,12 +16603,12 @@ fi echo $ac_n "checking for inet_aton()""... $ac_c" 1>&6 -echo "configure:16693: checking for inet_aton()" >&5 -if eval "test \"\${ol_cv_func_inet_aton+set}\" = set"; then +echo "configure:16607: checking for inet_aton()" >&5 +if eval "test \"`echo '$''{'ol_cv_func_inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_func_inet_aton=yes else @@ -16738,12 +16652,12 @@ EOF echo $ac_n "checking for _spawnlp""... $ac_c" 1>&6 -echo "configure:16742: checking for _spawnlp" >&5 -if eval "test \"\${ac_cv_func__spawnlp+set}\" = set"; then +echo "configure:16656: checking for _spawnlp" >&5 +if eval "test \"`echo '$''{'ac_cv_func__spawnlp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__spawnlp=yes" else @@ -16791,12 +16704,12 @@ fi echo $ac_n "checking for _snprintf""... $ac_c" 1>&6 -echo "configure:16795: checking for _snprintf" >&5 -if eval "test \"\${ac_cv_func__snprintf+set}\" = set"; then +echo "configure:16708: checking for _snprintf" >&5 +if eval "test \"`echo '$''{'ac_cv_func__snprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__snprintf=yes" else @@ -16846,12 +16758,12 @@ fi echo $ac_n "checking for _vsnprintf""... $ac_c" 1>&6 -echo "configure:16850: checking for _vsnprintf" >&5 -if eval "test \"\${ac_cv_func__vsnprintf+set}\" = set"; then +echo "configure:16762: checking for _vsnprintf" >&5 +if eval "test \"`echo '$''{'ac_cv_func__vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__vsnprintf=yes" else @@ -16901,12 +16812,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:16905: checking for vprintf" >&5 -if eval "test \"\${ac_cv_func_vprintf+set}\" = set"; then +echo "configure:16816: 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${ac_exeext}; then +if { (eval echo configure:16844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -16954,12 +16864,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:16958: checking for _doprnt" >&5 -if eval "test \"\${ac_cv_func__doprnt+set}\" = set"; then +echo "configure:16868: 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${ac_exeext}; then +if { (eval echo configure:16896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -17012,12 +16921,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:17016: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:16925: 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${ac_exeext}; then +if { (eval echo configure:16953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17119,12 +17027,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17123: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:17031: 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${ac_exeext}; then +if { (eval echo configure:17059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17176,12 +17083,12 @@ done for ac_func in getopt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17180: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:17087: 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${ac_exeext}; then +if { (eval echo configure:17115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17238,13 +17144,13 @@ fi # Check Configuration echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6 -echo "configure:17242: checking declaration of sys_errlist" >&5 -if eval "test \"\${ol_cv_dcl_sys_errlist+set}\" = set"; then +echo "configure:17148: 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 < @@ -17257,7 +17163,7 @@ int main() { char *c = (char *) *sys_errlist ; return 0; } EOF -if { (eval echo configure:17261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_dcl_sys_errlist=yes ol_cv_have_sys_errlist=yes @@ -17280,20 +17186,20 @@ EOF echo $ac_n "checking existence of sys_errlist""... $ac_c" 1>&6 -echo "configure:17284: checking existence of sys_errlist" >&5 -if eval "test \"\${ol_cv_have_sys_errlist+set}\" = set"; then +echo "configure:17190: 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:17297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_have_sys_errlist=yes else @@ -17512,6 +17418,24 @@ EOF fi fi +if test "$ol_enable_monitor" != no ; then + cat >> confdefs.h <<\EOF +#define SLAPD_MONITOR 1 +EOF + + BUILD_SLAPD=yes + BUILD_MONITOR=yes + if test "$ol_with_monitor_module" != static ; then + cat >> confdefs.h <<\EOF +#define SLAPD_MONITOR_DYNAMIC 1 +EOF + + BUILD_MONITOR=mod + BUILD_MONITOR_DYNAMIC=shared + SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-monitor/back_monitor.la" + fi +fi + if test "$ol_enable_passwd" != no ; then cat >> confdefs.h <<\EOF #define SLAPD_PASSWD 1 @@ -17661,6 +17585,8 @@ fi + + @@ -17742,7 +17668,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13.1" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -17785,6 +17711,7 @@ servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefi servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk \ servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk \ servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk \ +servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk \ servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk \ servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk \ servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/mod.mk \ @@ -17891,6 +17818,7 @@ s%@BUILD_DNSSRV@%$BUILD_DNSSRV%g s%@BUILD_LDAP@%$BUILD_LDAP%g s%@BUILD_LDBM@%$BUILD_LDBM%g s%@BUILD_META@%$BUILD_META%g +s%@BUILD_MONITOR@%$BUILD_MONITOR%g s%@BUILD_PASSWD@%$BUILD_PASSWD%g s%@BUILD_PERL@%$BUILD_PERL%g s%@BUILD_SHELL@%$BUILD_SHELL%g @@ -17901,6 +17829,7 @@ s%@BUILD_DNSSRV_DYNAMIC@%$BUILD_DNSSRV_DYNAMIC%g s%@BUILD_LDAP_DYNAMIC@%$BUILD_LDAP_DYNAMIC%g s%@BUILD_LDBM_DYNAMIC@%$BUILD_LDBM_DYNAMIC%g s%@BUILD_META_DYNAMIC@%$BUILD_META_DYNAMIC%g +s%@BUILD_MONITOR_DYNAMIC@%$BUILD_MONITOR_DYNAMIC%g s%@BUILD_PASSWD_DYNAMIC@%$BUILD_PASSWD_DYNAMIC%g s%@BUILD_PERL_DYNAMIC@%$BUILD_PERL_DYNAMIC%g s%@BUILD_SHELL_DYNAMIC@%$BUILD_SHELL_DYNAMIC%g @@ -18008,6 +17937,7 @@ servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefi servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk \ servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk \ servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk \ +servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk \ servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk \ servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk \ servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/mod.mk \ @@ -18064,7 +17994,7 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then rm -f "$ac_file" configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." case "$ac_file" in - *[Mm]akefile*) ac_comsub="1i\\ + *Makefile*) ac_comsub="1i\\ # $configure_input" ;; *) ac_comsub= ;; esac @@ -18199,5 +18129,5 @@ exit 0 EOF chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1 +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 diff --git a/configure.in b/configure.in index a96bba2df1..a7e3fed0e4 100644 --- a/configure.in +++ b/configure.in @@ -183,6 +183,9 @@ OL_ARG_WITH(ldbm_type,[ --with-ldbm-type use LDBM type], auto, OL_ARG_ENABLE(meta,[ --enable-meta enable metadirectory backend], no)dnl OL_ARG_WITH(meta_module,[ --with-meta-module module type], static, [static dynamic]) +OL_ARG_ENABLE(monitor,[ --enable-monitor enable monitor backend], no)dnl +OL_ARG_WITH(monitor_module,[ --with-monitor-module module type], static, + [static dynamic]) OL_ARG_ENABLE(passwd,[ --enable-passwd enable passwd backend], no)dnl OL_ARG_WITH(passwd_module,[ --with-passwd-module module type], static, [static dynamic]) @@ -231,6 +234,9 @@ if test $ol_enable_slapd = no ; then if test $ol_enable_meta = yes ; then AC_MSG_WARN([slapd disabled, ignoring --enable-meta argument]) fi + if test $ol_enable_module = yes ; then + AC_MSG_WARN([slapd disabled, ignoring --enable-monitor argument]) + fi if test $ol_enable_passwd = yes ; then AC_MSG_WARN([slapd disabled, ignoring --enable-passwd argument]) fi @@ -285,6 +291,9 @@ dnl fi if test $ol_with_meta_module != static ; then AC_MSG_WARN([slapd disabled, ignoring --with-meta-module argument]) fi + if test $ol_with_monitor_module != static ; then + AC_MSG_WARN([slapd disabled, ignoring --with-monitor-module argument]) + fi if test $ol_with_passwd_module != static ; then AC_MSG_WARN([slapd disabled, ignoring --with-passwd-module argument]) fi @@ -313,6 +322,7 @@ dnl fi ol_enable_ldap=no ol_enable_ldbm=no ol_enable_meta=no + ol_enable_monitor=no ol_enable_passwd=no ol_enable_perl=no ol_enable_shell=no @@ -335,6 +345,7 @@ dnl ol_enable_multimaster=no ol_with_ldap_module=static ol_with_ldbm_module=static ol_with_meta_module=static + ol_with_monitor_module=static ol_with_passwd_module=static ol_with_perl_module=static ol_with_shell_module=static @@ -365,6 +376,7 @@ elif test $ol_enable_ldbm = no ; then $ol_enable_dnssrv = no -a \ $ol_enable_ldap = no -a \ $ol_enable_meta = no -a \ + $ol_enable_monitor = no -a \ $ol_enable_passwd = no -a \ $ol_enable_perl = no -a \ $ol_enable_shell = no -a \ @@ -448,6 +460,7 @@ BUILD_DNSSRV=no BUILD_LDAP=no BUILD_LDBM=no BUILD_META=no +BUILD_MONITOR=no BUILD_PASSWD=no BUILD_PERL=no BUILD_SHELL=no @@ -459,6 +472,7 @@ BUILD_DNSSRV_DYNAMIC=static BUILD_LDAP_DYNAMIC=static BUILD_LDBM_DYNAMIC=static BUILD_META_DYNAMIC=static +BUILD_MONITOR_DYNAMIC=static BUILD_PASSWD_DYNAMIC=static BUILD_PERL_DYNAMIC=static BUILD_SHELL_DYNAMIC=static @@ -673,6 +687,7 @@ else ol_with_ldap_module=static ol_with_ldbm_module=static ol_with_meta_module=static + ol_with_monitor_module=static ol_with_passwd_module=static ol_with_perl_module=static ol_with_shell_module=static @@ -2378,6 +2393,19 @@ if test "$ol_enable_meta" != no ; then fi fi +if test "$ol_enable_monitor" != no ; then + AC_DEFINE(SLAPD_MONITOR,1,[define to support cn=Monitor backend]) + BUILD_SLAPD=yes + BUILD_MONITOR=yes + if test "$ol_with_monitor_module" != static ; then + AC_DEFINE(SLAPD_MONITOR_DYNAMIC,1, + [define to support dynamic cn=Monitor backend]) + BUILD_MONITOR=mod + BUILD_MONITOR_DYNAMIC=shared + SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-monitor/back_monitor.la" + fi +fi + if test "$ol_enable_passwd" != no ; then AC_DEFINE(SLAPD_PASSWD,1,[define to support PASSWD backend]) BUILD_SLAPD=yes @@ -2485,6 +2513,7 @@ AC_SUBST(BUILD_SLAPD) AC_SUBST(BUILD_LDAP) AC_SUBST(BUILD_LDBM) AC_SUBST(BUILD_META) + AC_SUBST(BUILD_MONITOR) AC_SUBST(BUILD_PASSWD) AC_SUBST(BUILD_PERL) AC_SUBST(BUILD_SHELL) @@ -2495,6 +2524,7 @@ AC_SUBST(BUILD_SLAPD) AC_SUBST(BUILD_LDAP_DYNAMIC) AC_SUBST(BUILD_LDBM_DYNAMIC) AC_SUBST(BUILD_META_DYNAMIC) + AC_SUBST(BUILD_MONITOR_DYNAMIC) AC_SUBST(BUILD_PASSWD_DYNAMIC) AC_SUBST(BUILD_PERL_DYNAMIC) AC_SUBST(BUILD_SHELL_DYNAMIC) @@ -2572,6 +2602,7 @@ servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefi servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk \ servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk \ servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk \ +servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk \ servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk \ servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk \ servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/mod.mk \ diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h index 53131487a8..c5d42f2ae8 100644 --- a/include/ldap_defaults.h +++ b/include/ldap_defaults.h @@ -222,9 +222,10 @@ Please try again later.\r\n" /* the following DNs must be normalized! */ /* dn of the default subschema subentry */ #define SLAPD_SCHEMA_DN "cn=Subschema" -#if 0 /* dn of the default "monitor" subentry */ #define SLAPD_MONITOR_DN "cn=Monitor" +#define SLAPD_MONITOR_NDN "CN=MONITOR" +#if 0 /* dn of the default "config" subentry */ #define SLAPD_CONFIG_DN "cn=Config" #endif diff --git a/include/portable.h.in b/include/portable.h.in index 4ec8e1a443..96bb1a98a9 100644 --- a/include/portable.h.in +++ b/include/portable.h.in @@ -928,6 +928,12 @@ /* define to support dynamic LDAP Metadirectory backend */ #undef SLAPD_META_DYNAMIC +/* define to support cn=Monitor backend */ +#undef SLAPD_MONITOR + +/* define to support dynamic cn=Monitor backend */ +#undef SLAPD_MONITOR_DYNAMIC + /* define to support PASSWD backend */ #undef SLAPD_PASSWD diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index 5415b9332e..8255ac426e 100644 --- a/servers/slapd/Makefile.in +++ b/servers/slapd/Makefile.in @@ -17,7 +17,7 @@ SRCS = main.c daemon.c connection.c search.c filter.c add.c charray.c \ repl.c lock.c controls.c extended.c kerberos.c passwd.c \ schema.c schema_check.c schema_init.c schema_prep.c \ schemaparse.c ad.c at.c mr.c syntax.c oc.c saslauthz.c \ - monitor.c configinfo.c starttls.c index.c sets.c \ + configinfo.c starttls.c index.c sets.c \ root_dse.c sasl.c module.c suffixalias.c mra.c mods.c \ $(@PLAT@_SRCS) @@ -29,7 +29,7 @@ OBJS = main.o daemon.o connection.o search.o filter.o add.o charray.o \ repl.o lock.o controls.o extended.o kerberos.o passwd.o \ schema.o schema_check.o schema_init.o schema_prep.o \ schemaparse.o ad.o at.o mr.o syntax.o oc.o saslauthz.o \ - monitor.o configinfo.o starttls.o index.o sets.o \ + configinfo.o starttls.o index.o sets.o \ root_dse.o sasl.o module.o suffixalias.o mra.o mods.o \ $(@PLAT@_OBJS) diff --git a/servers/slapd/back-monitor/Copyright b/servers/slapd/back-monitor/Copyright new file mode 100644 index 0000000000..6237b95ad5 --- /dev/null +++ b/servers/slapd/back-monitor/Copyright @@ -0,0 +1,29 @@ +Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. +COPYING RESTRICTIONS APPLY, see COPYRIGHT file + +Copyright 2001, Pierangelo Masarati, All rights reserved. + +This work has beed deveolped for the OpenLDAP Foundation +in the hope that it may be useful to the Open Source community, +but WITHOUT ANY WARRANTY. + +Permission is granted to anyone to use this software for any purpose +on any computer system, and to alter it and redistribute it, subject +to the following restrictions: + +1. The author and SysNet s.n.c. are not responsible for the consequences + of use of this software, no matter how awful, even if they arise from + flaws in it. + +2. The origin of this software must not be misrepresented, either by + explicit claim or by omission. Since few users ever read sources, + credits should appear in the documentation. + +3. Altered versions must be plainly marked as such, and must not be + misrepresented as being the original software. Since few users + ever read sources, credits should appear in the documentation. + SysNet s.n.c. cannot be responsible for the consequences of the + alterations. + +4. This notice may not be removed or altered. + diff --git a/servers/slapd/back-monitor/Makefile.in b/servers/slapd/back-monitor/Makefile.in new file mode 100644 index 0000000000..d8bcbd0fb2 --- /dev/null +++ b/servers/slapd/back-monitor/Makefile.in @@ -0,0 +1,39 @@ +# $OpenLDAP$ + +SRCS = init.c search.c compare.c abandon.c \ + cache.c entry.c \ + backend.c database.c thread.c conn.c rww.c \ + dummy.c +OBJS = init.o search.o compare.o abandon.o \ + cache.o entry.o \ + backend.o database.o thread.o conn.o rww.o \ + dummy.o + +LDAP_INCDIR= ../../../include +LDAP_LIBDIR= ../../../libraries + +BUILD_OPT = "--enable-monitor" +BUILD_MOD = @BUILD_MONITOR@ +LINKAGE = @BUILD_MONITOR_DYNAMIC@ + +DYN_DEFS = -DLBER_DECL=dllimport -DLDAP_DECL=dllimport + +# TODO +#NT_mod_DYN_MODDEFS = +#NT_mod_STAT_MODDEFS = + +NT_yes_DYN_MODDEFS = $(DYN_DEFS) +NT_yes_STAT_MODDEFS = + +MODDEFS = $(@PLAT@_@BUILD_MONITOR@_@LIB_LINKAGE@_MODDEFS) + +LIBBASE = back_monitor + +XINCPATH = -I.. -I$(srcdir)/.. +XDEFS = $(MODULES_CPPFLAGS) + +all-local-lib: ../.backend + +../.backend: lib$(LIBBASE).a + @touch $@ + diff --git a/servers/slapd/back-monitor/README b/servers/slapd/back-monitor/README new file mode 100644 index 0000000000..7a574a1d5a --- /dev/null +++ b/servers/slapd/back-monitor/README @@ -0,0 +1,33 @@ +back-monitor + +Backend for monitoring the server's activity. It must be explicitly +enabled by configuring with `--enable-monitor' set; then it must be +activated by placing in slapd.conf the configure directive + +database monitor + +The suffix "cn=Monitor" is implicitly activated (it cannot be given +as a suffix of the database as usually done for conventional backends). + +The backend root is "cn=Monitor"; the first level entries represent +the monitored subsystems. It is being implemented in a modular way, +to ease the addition of new subsystems. +All the subsystems get a default "cn" attribute, represented by the +subsystem's name, and they all have "top", "LDAPsubEntry" and +"monitorSubEntry" objectclasses (the latter has not been defined yet, +pending the design of the monitor schema and its registration under +OpenLDAP's OID). +Most of the sybsystems contain an additional depth level, represented +by detailed item monitoring. +All the entries undergo an update operation, if a related method is +defined, prior to being returned. Moreover, there's a mechanism to +allow volatile entries to be defined, and generated on the fly when +requested. As an instance, the connection statistics are updated +at each request, while each active connection data is created on the +fly. + +This document is in a very early stage of maturity and will probably +be rewritten many times before the monitor backend is released. + +Author: Pierangelo Masarati + diff --git a/servers/slapd/back-monitor/abandon.c b/servers/slapd/back-monitor/abandon.c new file mode 100644 index 0000000000..79b58f913f --- /dev/null +++ b/servers/slapd/back-monitor/abandon.c @@ -0,0 +1,52 @@ +/* abandon.c - monitor backend abandon routine */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* + * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Copyright 2001, Pierangelo Masarati, All rights reserved. + * + * This work has beed deveolped for the OpenLDAP Foundation + * in the hope that it may be useful to the Open Source community, + * but WITHOUT ANY WARRANTY. + * + * Permission is granted to anyone to use this software for any purpose + * on any computer system, and to alter it and redistribute it, subject + * to the following restrictions: + * + * 1. The author and SysNet s.n.c. are not responsible for the consequences + * of use of this software, no matter how awful, even if they arise from + * flaws in it. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Since few users ever read sources, + * credits should appear in the documentation. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. Since few users + * ever read sources, credits should appear in the documentation. + * SysNet s.n.c. cannot be responsible for the consequences of the + * alterations. + * + * 4. This notice may not be removed or altered. + */ + +#include "portable.h" + +#include +#include "back-monitor.h" + +int +monitor_back_abandon( + BackendDB *be, + struct slap_conn *c, + struct slap_op *o, + ber_int_t msgid +) +{ + return( 0 ); +} + diff --git a/servers/slapd/back-monitor/back-monitor.h b/servers/slapd/back-monitor/back-monitor.h new file mode 100644 index 0000000000..73c360a409 --- /dev/null +++ b/servers/slapd/back-monitor/back-monitor.h @@ -0,0 +1,191 @@ +/* back-monitor.h - ldap monitor back-end header file */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* + * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Copyright 2001, Pierangelo Masarati, All rights reserved. + * + * This work has beed deveolped for the OpenLDAP Foundation + * in the hope that it may be useful to the Open Source community, + * but WITHOUT ANY WARRANTY. + * + * Permission is granted to anyone to use this software for any purpose + * on any computer system, and to alter it and redistribute it, subject + * to the following restrictions: + * + * 1. The author and SysNet s.n.c. are not responsible for the consequences + * of use of this software, no matter how awful, even if they arise from + * flaws in it. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Since few users ever read sources, + * credits should appear in the documentation. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. Since few users + * ever read sources, credits should appear in the documentation. + * SysNet s.n.c. cannot be responsible for the consequences of the + * alterations. + * + * 4. This notice may not be removed or altered. + */ + +#ifndef _BACK_MONITOR_H_ +#define _BACK_MONITOR_H_ + +#include +#include +#include +#include + +LDAP_BEGIN_DECL + +/* + * The cache maps DNs to Entries. + * Each entry, on turn, holds the list of its children in the e_private field. + * This is used by search operation to perform onelevel and subtree candidate + * selection. + */ +struct monitorcache { + char *mc_ndn; + Entry *mc_e; +}; + +struct monitorentrypriv { + ldap_pvt_thread_mutex_t mp_mutex; /* entry mutex */ + Entry *mp_next; /* pointer to next sibling */ + Entry *mp_children; /* pointer to first child */ + struct monitorsubsys *mp_info; /* subsystem info */ +#define mp_type mp_info->mss_type + int mp_flags; /* flags */ + +#define MONITOR_F_NONE 0x00 +#define MONITOR_F_SUB 0x01 /* subentry of subsystem */ +#define MONITOR_F_PERSISTENT 0x10 /* persistent entry */ +#define MONITOR_F_PERSISTENT_CH 0x20 /* subsystem generates + persistent entries */ +#define MONITOR_F_VOLATILE 0x40 /* volatile entry */ +#define MONITOR_F_VOLATILE_CH 0x80 /* subsystem generates + volatile entries */ +}; + +struct monitorinfo { + Avlnode *mi_cache; + ldap_pvt_thread_mutex_t mi_cache_mutex; +}; + +/* + * DNs + */ +#define SLAPD_MONITOR_LISTENER 0 +#define SLAPD_MONITOR_LISTENER_NAME "Listener" +#define SLAPD_MONITOR_LISTENER_RDN \ + "cn=" SLAPD_MONITOR_LISTENER_NAME +#define SLAPD_MONITOR_LISTENER_DN \ + SLAPD_MONITOR_LISTENER_RDN "," SLAPD_MONITOR_DN + +#define SLAPD_MONITOR_DATABASE 1 +#define SLAPD_MONITOR_DATABASE_NAME "Databases" +#define SLAPD_MONITOR_DATABASE_RDN \ + "cn=" SLAPD_MONITOR_DATABASE_NAME +#define SLAPD_MONITOR_DATABASE_DN \ + SLAPD_MONITOR_DATABASE_RDN "," SLAPD_MONITOR_DN + +#define SLAPD_MONITOR_BACKEND 2 +#define SLAPD_MONITOR_BACKEND_NAME "Backends" +#define SLAPD_MONITOR_BACKEND_RDN \ + "cn=" SLAPD_MONITOR_BACKEND_NAME +#define SLAPD_MONITOR_BACKEND_DN \ + SLAPD_MONITOR_BACKEND_RDN "," SLAPD_MONITOR_DN + +#define SLAPD_MONITOR_THREAD 3 +#define SLAPD_MONITOR_THREAD_NAME "Threads" +#define SLAPD_MONITOR_THREAD_RDN \ + "cn=" SLAPD_MONITOR_THREAD_NAME +#define SLAPD_MONITOR_THREAD_DN \ + SLAPD_MONITOR_THREAD_RDN "," SLAPD_MONITOR_DN + +#define SLAPD_MONITOR_SASL 4 +#define SLAPD_MONITOR_SASL_NAME "SASL" +#define SLAPD_MONITOR_SASL_RDN \ + "cn=" SLAPD_MONITOR_SASL_NAME +#define SLAPD_MONITOR_SASL_DN \ + SLAPD_MONITOR_SASL_RDN "," SLAPD_MONITOR_DN + +#define SLAPD_MONITOR_TLS 5 +#define SLAPD_MONITOR_TLS_NAME "TLS" +#define SLAPD_MONITOR_TLS_RDN \ + "cn=" SLAPD_MONITOR_TLS_NAME +#define SLAPD_MONITOR_TLS_DN \ + SLAPD_MONITOR_TLS_RDN "," SLAPD_MONITOR_DN + +#define SLAPD_MONITOR_CONN 6 +#define SLAPD_MONITOR_CONN_NAME "Connections" +#define SLAPD_MONITOR_CONN_RDN \ + "cn=" SLAPD_MONITOR_CONN_NAME +#define SLAPD_MONITOR_CONN_DN \ + SLAPD_MONITOR_CONN_RDN "," SLAPD_MONITOR_DN + +#define SLAPD_MONITOR_READW 7 +#define SLAPD_MONITOR_READW_NAME "Read Waiters" +#define SLAPD_MONITOR_READW_RDN \ + "cn=" SLAPD_MONITOR_READW_NAME +#define SLAPD_MONITOR_READW_DN \ + SLAPD_MONITOR_READW_RDN "," SLAPD_MONITOR_DN + +#define SLAPD_MONITOR_WRITEW 8 +#define SLAPD_MONITOR_WRITEW_NAME "Write Waiters" +#define SLAPD_MONITOR_WRITEW_RDN \ + "cn=" SLAPD_MONITOR_WRITEW_NAME +#define SLAPD_MONITOR_WRITEW_DN \ + SLAPD_MONITOR_WRITEW_RDN "," SLAPD_MONITOR_DN + +struct monitorsubsys { + int mss_type; + char *mss_name; + char *mss_rdn; + char *mss_dn; + char *mss_ndn; + int mss_flags; + +#define MONITOR_HAS_VOLATILE_CH( mp ) \ + ( ( mp )->mp_flags & MONITOR_F_VOLATILE_CH ) + + int ( *mss_init )( BackendDB * ); + int ( *mss_update )( struct monitorinfo *, Entry * ); + int ( *mss_create )( struct monitorinfo *, const char *ndn, Entry *, Entry ** ); +}; + +extern struct monitorsubsys monitor_subsys[]; + +extern AttributeDescription *monitor_ad_desc; + +/* + * cache + */ + +extern int monitor_cache_cmp LDAP_P(( const void *c1, const void *c2 )); +extern int monitor_cache_dup LDAP_P(( void *c1, void *c2 )); +extern int monitor_cache_add LDAP_P(( struct monitorinfo *mi, Entry *e )); +extern int monitor_cache_get LDAP_P(( struct monitorinfo *mi, const char *ndn, Entry **ep )); +extern int monitor_cache_dn2entry LDAP_P(( struct monitorinfo *mi, const char *ndn, Entry **ep )); +extern int monitor_cache_lock LDAP_P(( Entry *e )); +extern int monitor_cache_release LDAP_P(( struct monitorinfo *mi, Entry *e )); + +/* + * update + */ + +extern int monitor_entry_update LDAP_P(( struct monitorinfo *mi, Entry *e )); +extern int monitor_entry_create LDAP_P(( struct monitorinfo *mi, const char *ndn, Entry *e_parent, Entry **ep )); + +LDAP_END_DECL + +#include "proto-back-monitor.h" + +#endif /* _back_monitor_h_ */ + diff --git a/servers/slapd/back-monitor/backend.c b/servers/slapd/back-monitor/backend.c new file mode 100644 index 0000000000..ca359096a8 --- /dev/null +++ b/servers/slapd/back-monitor/backend.c @@ -0,0 +1,163 @@ +/* backend.c - deals with backend subsystem */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* + * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Copyright 2001, Pierangelo Masarati, All rights reserved. + * + * This work has beed deveolped for the OpenLDAP Foundation + * in the hope that it may be useful to the Open Source community, + * but WITHOUT ANY WARRANTY. + * + * Permission is granted to anyone to use this software for any purpose + * on any computer system, and to alter it and redistribute it, subject + * to the following restrictions: + * + * 1. The author and SysNet s.n.c. are not responsible for the consequences + * of use of this software, no matter how awful, even if they arise from + * flaws in it. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Since few users ever read sources, + * credits should appear in the documentation. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. Since few users + * ever read sources, credits should appear in the documentation. + * SysNet s.n.c. cannot be responsible for the consequences of the + * alterations. + * + * 4. This notice may not be removed or altered. + */ + + +#include "portable.h" + +#include + +#include "slap.h" +#include "back-monitor.h" + +/* + * initializes backend subentries + */ +int +monitor_subsys_backend_init( + BackendDB *be +) +{ + struct monitorinfo *mi; + Entry *e, *e_backend, *e_tmp; + int i; + struct monitorentrypriv *mp; + struct berval *bv[2], val; + + mi = ( struct monitorinfo * )be->be_private; + + if ( monitor_cache_get( mi, + monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn, + &e_backend ) ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "monitor_subsys_backend_init: " + "unable to get entry '%s'\n", + monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn )); +#else + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_backend_init: " + "unable to get entry '%s'\n%s%s", + monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn, + "", "" ); +#endif + return( -1 ); + } + + bv[0] = &val; + bv[1] = NULL; + e_tmp = NULL; + for ( i = nBackendInfo; i--; ) { + char buf[1024]; + BackendInfo *bi; + + bi = &backendInfo[i]; + + snprintf( buf, sizeof( buf ), + "dn: cn=%d,%s\n" + "objectClass: top\n" + "objectClass: LDAPsubEntry\n" +#ifdef SLAPD_MONITORSUBENTRY + "objectClass: monitorSubEntry\n" +#else /* !SLAPD_MONITORSUBENTRY */ + "objectClass: extensibleObject\n" +#endif /* !SLAPD_MONITORSUBENTRY */ + "cn: %d\n", + i, + monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn, + i ); + + e = str2entry( buf ); + if ( e == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "monitor_subsys_backend_init: " + "unable to create entry 'cn=%d,%s'\n", + i, + monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn )); +#else + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_backend_init: " + "unable to create entry 'cn=%d,%s'\n%s", + i, + monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn, + "" ); +#endif + return( -1 ); + } + + val.bv_val = bi->bi_type; + val.bv_len = strlen( val.bv_val ); + + attr_merge( e, monitor_ad_desc, bv ); + attr_merge( e_backend, monitor_ad_desc, bv ); + + mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 ); + e->e_private = ( void * )mp; + mp->mp_next = e_tmp; + mp->mp_children = NULL; + mp->mp_info = &monitor_subsys[SLAPD_MONITOR_BACKEND]; + mp->mp_flags = monitor_subsys[SLAPD_MONITOR_BACKEND].mss_flags + | MONITOR_F_SUB; + + if ( monitor_cache_add( mi, e ) ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "monitor_subsys_backend_init: " + "unable to add entry 'cn=%d,%s'\n", + i, + monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn )); +#else + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_backend_init: " + "unable to add entry 'cn=%d,%s'\n%s", + i, + monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn, + "" ); +#endif + return( -1 ); + } + + e_tmp = e; + } + + mp = ( struct monitorentrypriv * )e_backend->e_private; + mp->mp_children = e_tmp; + + monitor_cache_release( mi, e_backend); + + return( 0 ); +} + diff --git a/servers/slapd/back-monitor/cache.c b/servers/slapd/back-monitor/cache.c new file mode 100644 index 0000000000..f5d70f59e1 --- /dev/null +++ b/servers/slapd/back-monitor/cache.c @@ -0,0 +1,244 @@ +/* cache.c - routines to maintain an in-core cache of entries */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* + * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Copyright 2001, Pierangelo Masarati, All rights reserved. + * + * This work has beed deveolped for the OpenLDAP Foundation + * in the hope that it may be useful to the Open Source community, + * but WITHOUT ANY WARRANTY. + * + * Permission is granted to anyone to use this software for any purpose + * on any computer system, and to alter it and redistribute it, subject + * to the following restrictions: + * + * 1. The author and SysNet s.n.c. are not responsible for the consequences + * of use of this software, no matter how awful, even if they arise from + * flaws in it. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Since few users ever read sources, + * credits should appear in the documentation. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. Since few users + * ever read sources, credits should appear in the documentation. + * SysNet s.n.c. cannot be responsible for the consequences of the + * alterations. + * + * 4. This notice may not be removed or altered. + */ + +#include "portable.h" + +#include + +#include "slap.h" + +#include "back-monitor.h" + +/* + * compares entries based on the dn + */ +int +monitor_cache_cmp( + const void *c1, + const void *c2 +) +{ + struct monitorcache *cc1 = ( struct monitorcache * )c1; + struct monitorcache *cc2 = ( struct monitorcache * )c2; + + /* + * case sensitive, because the dn MUST be normalized + */ + return strcmp( cc1->mc_ndn, cc2->mc_ndn ); +} + +/* + * checks for duplicate entries + */ +int +monitor_cache_dup( + void *c1, + void *c2 +) +{ + struct monitorcache *cc1 = ( struct monitorcache * )c1; + struct monitorcache *cc2 = ( struct monitorcache * )c2; + + /* + * case sensitive, because the dn MUST be normalized + */ + return ( strcmp( cc1->mc_ndn, cc2->mc_ndn ) == 0 ) ? -1 : 0; +} + +/* + * adds an entry to the cache and inits the mutex + */ +int +monitor_cache_add( + struct monitorinfo *mi, + Entry *e +) +{ + struct monitorcache *mc; + struct monitorentrypriv *mp; + int rc; + + assert( mi != NULL ); + assert( e != NULL ); + + mp = ( struct monitorentrypriv *)e->e_private; + ldap_pvt_thread_mutex_init( &mp->mp_mutex ); + + mc = ( struct monitorcache * )ch_malloc( sizeof( struct monitorcache ) ); + mc->mc_ndn = e->e_ndn; + mc->mc_e = e; + ldap_pvt_thread_mutex_lock( &mi->mi_cache_mutex ); + rc = avl_insert( &mi->mi_cache, ( caddr_t )mc, + monitor_cache_cmp, monitor_cache_dup ); + ldap_pvt_thread_mutex_unlock( &mi->mi_cache_mutex ); + + return rc; +} + +/* + * locks the entry (no r/w) + */ +int +monitor_cache_lock( + Entry *e +) +{ + struct monitorentrypriv *mp; + + assert( e != NULL ); + assert( e->e_private != NULL ); + + mp = ( struct monitorentrypriv * )e->e_private; + ldap_pvt_thread_mutex_lock( &mp->mp_mutex ); + + return( 0 ); +} + +/* + * gets an entry from the cache based on the normalized dn + * with mutex locked + */ +int +monitor_cache_get( + struct monitorinfo *mi, + const char *ndn, + Entry **ep +) +{ + struct monitorcache tmp_mc, *mc; + + assert( mi != NULL ); + assert( ndn != NULL ); + assert( ep != NULL ); + + tmp_mc.mc_ndn = ( char * )ndn; + ldap_pvt_thread_mutex_lock( &mi->mi_cache_mutex ); + mc = ( struct monitorcache * )avl_find( mi->mi_cache, + ( caddr_t )&tmp_mc, monitor_cache_cmp ); + + if ( mc != NULL ) { + /* entry is returned with mutex locked */ + monitor_cache_lock( mc->mc_e ); + ldap_pvt_thread_mutex_unlock( &mi->mi_cache_mutex ); + *ep = mc->mc_e; + + return( 0 ); + } + + ldap_pvt_thread_mutex_unlock( &mi->mi_cache_mutex ); + *ep = NULL; + + return( -1 ); +} + +/* + * If the entry exists in cache, it is returned in locked status; + * otherwise, if the parent exists, if it may generate volatile + * descendants an attempt to generate the required entry is + * performed and, if successful, the entry is returned + */ +int +monitor_cache_dn2entry( + struct monitorinfo *mi, + const char *ndn, + Entry **ep +) +{ + int rc; + + char *p_ndn; + Entry *e_parent; + struct monitorentrypriv *mp; + + assert( mi != NULL ); + assert( ndn != NULL ); + assert( ep != NULL ); + + rc = monitor_cache_get( mi, ndn, ep ); + if ( !rc && *ep != NULL ) { + return( 0 ); + } + + /* try with parent/ancestors */ + p_ndn = dn_parent( NULL, ndn ); + rc = monitor_cache_dn2entry( mi, p_ndn, &e_parent ); + free( p_ndn ); + if ( rc || e_parent == NULL) { + return( -1 ); + } + + mp = ( struct monitorentrypriv * )e_parent->e_private; + rc = -1; + if ( mp->mp_flags & MONITOR_F_VOLATILE_CH ) { + /* parent entry generates volatile children */ + rc = monitor_entry_create( mi, ndn, e_parent, ep ); + } + monitor_cache_release( mi, e_parent ); + + return( rc ); +} + +/* + * releases the lock of the entry; if it is marked as volatile, it is + * destroyed. + */ +int +monitor_cache_release( + struct monitorinfo *mi, + Entry *e +) +{ + struct monitorentrypriv *mp; + + assert( mi != NULL ); + assert( e != NULL ); + assert( e->e_private != NULL ); + + mp = ( struct monitorentrypriv * )e->e_private; + + if ( mp->mp_flags & MONITOR_F_VOLATILE ) { + /* volatile entries do not return to cache */ + ldap_pvt_thread_mutex_destroy( &mp->mp_mutex ); + ch_free( mp ); + e->e_private = NULL; + entry_free( e ); + return( 0 ); + } + + ldap_pvt_thread_mutex_unlock( &mp->mp_mutex ); + return( 0 ); +} + diff --git a/servers/slapd/back-monitor/compare.c b/servers/slapd/back-monitor/compare.c new file mode 100644 index 0000000000..f4318c5e94 --- /dev/null +++ b/servers/slapd/back-monitor/compare.c @@ -0,0 +1,56 @@ +/* compare.c - monitor backend compare routine */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* + * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Copyright 2001, Pierangelo Masarati, All rights reserved. + * + * This work has beed deveolped for the OpenLDAP Foundation + * in the hope that it may be useful to the Open Source community, + * but WITHOUT ANY WARRANTY. + * + * Permission is granted to anyone to use this software for any purpose + * on any computer system, and to alter it and redistribute it, subject + * to the following restrictions: + * + * 1. The author and SysNet s.n.c. are not responsible for the consequences + * of use of this software, no matter how awful, even if they arise from + * flaws in it. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Since few users ever read sources, + * credits should appear in the documentation. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. Since few users + * ever read sources, credits should appear in the documentation. + * SysNet s.n.c. cannot be responsible for the consequences of the + * alterations. + * + * 4. This notice may not be removed or altered. + */ + +#include "portable.h" + +#include + +#include +#include "back-monitor.h" + +int +monitor_back_compare( + Backend *be, + Connection *conn, + Operation *op, + const char *dn, + const char *ndn, + AttributeAssertion *ava +) +{ + return( 0 ); +} + diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c new file mode 100644 index 0000000000..84283a579f --- /dev/null +++ b/servers/slapd/back-monitor/conn.c @@ -0,0 +1,316 @@ +/* conn.c - deal with connection subsystem */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* + * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Copyright 2001, Pierangelo Masarati, All rights reserved. + * + * This work has beed deveolped for the OpenLDAP Foundation + * in the hope that it may be useful to the Open Source community, + * but WITHOUT ANY WARRANTY. + * + * Permission is granted to anyone to use this software for any purpose + * on any computer system, and to alter it and redistribute it, subject + * to the following restrictions: + * + * 1. The author and SysNet s.n.c. are not responsible for the consequences + * of use of this software, no matter how awful, even if they arise from + * flaws in it. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Since few users ever read sources, + * credits should appear in the documentation. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. Since few users + * ever read sources, credits should appear in the documentation. + * SysNet s.n.c. cannot be responsible for the consequences of the + * alterations. + * + * 4. This notice may not be removed or altered. + */ + +#include "portable.h" + +#include + +#include "slap.h" +#include "back-monitor.h" + +int +monitor_subsys_conn_init( + BackendDB *be +) +{ + struct monitorinfo *mi; + + char buf[1024]; + Entry *e; + struct berval *bv[2], val; + + assert( be != NULL ); + + mi = ( struct monitorinfo * )be->be_private; + + if ( monitor_cache_get( mi, + monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn, &e ) ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "monitor_subsys_conn_init: " + "unable to get entry '%s'\n", + monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn )); +#else + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_conn_init: " + "unable to get entry '%s'\n%s%s", + monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn, + "", "" ); +#endif + return( -1 ); + } + + bv[0] = &val; + bv[1] = NULL; + + monitor_cache_release( mi, e ); + + return( 0 ); +} + +int +monitor_subsys_conn_update( + struct monitorinfo *mi, + Entry *e +) +{ + Connection *c; + int connindex; + int nconns, nwritewaiters, nreadwaiters; + + Attribute *a; + struct berval *bv[2], val, **b = NULL; + char buf[1024]; + + assert( mi != NULL ); + assert( e != NULL ); + + bv[0] = &val; + bv[1] = NULL; + + nconns = nwritewaiters = nreadwaiters = 0; + for ( c = connection_first( &connindex ); + c != NULL; + c = connection_next( c, &connindex ), nconns++ ) { + if ( c->c_writewaiter ) { + nwritewaiters++; + } + if ( c->c_currentber != NULL ) { + nreadwaiters++; + } + } + connection_done(c); + +#if 0 + snprintf( buf, sizeof( buf ), "readwaiters=%d", nreadwaiters ); + + if ( ( a = attr_find( e->e_attrs, monitor_ad_desc ) ) != NULL ) { + for ( b = a->a_vals; b[0] != NULL; b++ ) { + if ( strncmp( b[0]->bv_val, "readwaiters=", + sizeof( "readwaiters=" ) - 1 ) == 0 ) { + free( b[0]->bv_val ); + b[0] = ber_bvstrdup( buf ); + break; + } + } + } + + if ( b == NULL || b[0] == NULL ) { + val.bv_val = buf; + val.bv_len = strlen( buf ); + attr_merge( e, monitor_ad_desc, bv ); + } +#endif + + return( 0 ); +} + +static int +conn_create( + Connection *c, + Entry **ep +) +{ + struct monitorentrypriv *mp; + struct tm *ltm; + char buf[1024]; + char buf2[22]; + char buf3[22]; + + struct berval *bv[2], val; + + Entry *e; + + assert( c != NULL ); + assert( ep != NULL ); + + snprintf( buf, sizeof( buf ), + "dn: cn=%ld,%s\n" + "objectClass: top\n" + "objectClass: LDAPsubEntry\n" +#ifdef SLAPD_MONITORSUBENTRY + "objectClass: monitorSubEntry\n" +#else /* !SLAPD_MONITORSUBENTRY */ + "objectClass: extensibleObject\n" +#endif /* !SLAPD_MONITORSUBENTRY */ + "cn: %ld\n", + c->c_connid, monitor_subsys[SLAPD_MONITOR_CONN].mss_dn, + c->c_connid ); + e = str2entry( buf ); + + if ( e == NULL) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "monitor_subsys_conn_create: " + "unable to create entry " + "'cn=%ld,%s' entry\n", + c->c_connid, + monitor_subsys[SLAPD_MONITOR_CONN].mss_dn )); +#else + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_conn_create: " + "unable to create entry " + "'cn=%ld,%s' entry\n%s", + c->c_connid, + monitor_subsys[SLAPD_MONITOR_CONN].mss_dn, "" ); +#endif + return( -1 ); + } + + ldap_pvt_thread_mutex_lock( &gmtime_mutex ); + + ltm = gmtime( &c->c_starttime ); + strftime( buf2, sizeof(buf2), "%Y%m%d%H%M%SZ", ltm ); + + ltm = gmtime( &c->c_activitytime ); + strftime( buf3, sizeof(buf2), "%Y%m%d%H%M%SZ", ltm ); + + ldap_pvt_thread_mutex_unlock( &gmtime_mutex ); + + sprintf( buf, + "%ld : %ld " + ": %ld/%ld/%ld/%ld " + ": %ld/%ld/%ld " + ": %s%s%s%s%s%s " + ": %s : %s : %s " + ": %s : %s : %s : %s", + c->c_connid, + (long) c->c_protocol, + c->c_n_ops_received, c->c_n_ops_executing, + c->c_n_ops_pending, c->c_n_ops_completed, + + /* add low-level counters here */ + c->c_n_get, c->c_n_read, c->c_n_write, + + c->c_currentber ? "r" : "", + c->c_writewaiter ? "w" : "", + c->c_ops != NULL ? "x" : "", + c->c_pending_ops != NULL ? "p" : "", + connection_state2str( c->c_conn_state ), + c->c_sasl_bind_in_progress ? "S" : "", + + c->c_cdn ? c->c_cdn : SLAPD_ANONYMOUS, + + c->c_listener_url, + c->c_peer_domain, + c->c_peer_name, + c->c_sock_name, + + buf2, + buf3 + ); + + bv[0] = &val; + bv[1] = NULL; + + val.bv_val = buf; + val.bv_len = strlen( buf ); + attr_merge( e, monitor_ad_desc, bv ); + + mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 ); + e->e_private = ( void * )mp; + mp->mp_info = &monitor_subsys[ SLAPD_MONITOR_CONN ]; + mp->mp_children = NULL; + mp->mp_flags = MONITOR_F_SUB | MONITOR_F_VOLATILE; + + *ep = e; + + return( 0 ); +} + +int +monitor_subsys_conn_create( + struct monitorinfo *mi, + const char *ndn, + Entry *e_parent, + Entry **ep +) +{ + Connection *c; + int connindex; + struct monitorentrypriv *mp; + + assert( mi != NULL ); + assert( e_parent != NULL ); + assert( ep != NULL ); + + *ep = NULL; + + if ( ndn == NULL ) { + Entry *e, *e_tmp = NULL; + + /* create all the children of e_parent */ + for ( c = connection_first( &connindex ); + c != NULL; + c = connection_next( c, &connindex )) { + if ( conn_create( c, &e ) || e == NULL ) { + // error + } + mp = ( struct monitorentrypriv * )e->e_private; + mp->mp_next = e_tmp; + e_tmp = e; + } + connection_done(c); + + *ep = e; + } else { + /* create exactly the required entry */ + char *rdn, *value; + unsigned long connid; + + rdn = dn_rdn( NULL, ndn ); + value = rdn_attr_value( rdn ); + connid = atol( value ); + free( value ); + free( rdn ); + + for ( c = connection_first( &connindex ); + c != NULL; + c = connection_next( c, &connindex )) { + if ( c->c_connid == connid ) { + if ( conn_create( c, ep ) || *ep == NULL ) { + // error + } + } + } + + connection_done(c); + + } + + return( 0 ); +} + diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c new file mode 100644 index 0000000000..3c3b5c4020 --- /dev/null +++ b/servers/slapd/back-monitor/database.c @@ -0,0 +1,169 @@ +/* database.c - deals with database subsystem */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* + * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Copyright 2001, Pierangelo Masarati, All rights reserved. + * + * This work has beed deveolped for the OpenLDAP Foundation + * in the hope that it may be useful to the Open Source community, + * but WITHOUT ANY WARRANTY. + * + * Permission is granted to anyone to use this software for any purpose + * on any computer system, and to alter it and redistribute it, subject + * to the following restrictions: + * + * 1. The author and SysNet s.n.c. are not responsible for the consequences + * of use of this software, no matter how awful, even if they arise from + * flaws in it. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Since few users ever read sources, + * credits should appear in the documentation. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. Since few users + * ever read sources, credits should appear in the documentation. + * SysNet s.n.c. cannot be responsible for the consequences of the + * alterations. + * + * 4. This notice may not be removed or altered. + */ + +#include "portable.h" + +#include + +#include "slap.h" +#include "back-monitor.h" + +int +monitor_subsys_database_init( + BackendDB *be +) +{ + struct monitorinfo *mi; + Entry *e, *e_database, *e_tmp; + int i; + struct monitorentrypriv *mp; + AttributeDescription *ad_nc = slap_schema.si_ad_namingContexts; + struct berval *bv[2], val; + + assert( be != NULL ); + assert( monitor_ad_desc != NULL ); + + mi = ( struct monitorinfo * )be->be_private; + + if ( monitor_cache_get( mi, + monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn, + &e_database ) ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "monitor_subsys_database_init: " + "unable to get entry '%s'\n", + monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn )); +#else + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_database_init: " + "unable to get entry '%s'\n%s%s", + monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn, + "", "" ); +#endif + return( -1 ); + } + + bv[0] = &val; + bv[1] = NULL; + e_tmp = NULL; + for ( i = nBackendDB; i--; ) { + char buf[1024]; + int j; + + be = &backendDB[i]; + + snprintf( buf, sizeof( buf ), + "dn: cn=%d,%s\n" + "objectClass: top\n" + "objectClass: LDAPsubEntry\n" +#ifdef SLAPD_MONITORSUBENTRY + "objectClass: monitorSubEntry\n" +#else /* !SLAPD_MONITORSUBENTRY */ + "objectClass: extensibleObject\n" +#endif /* !SLAPD_MONITORSUBENTRY */ + "cn: %d\n", + i, + monitor_subsys[SLAPD_MONITOR_DATABASE].mss_dn, + i ); + + e = str2entry( buf ); + if ( e == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "monitor_subsys_database_init: " + "unable to create entry 'cn=%d,%s'\n", + i, + monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn )); +#else + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_database_init: " + "unable to create entry 'cn=%d,%s'\n%s", + i, + monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn, + "" ); +#endif + return( -1 ); + } + + val.bv_val = be->bd_info->bi_type; + val.bv_len = strlen( val.bv_val ); + attr_merge( e, monitor_ad_desc, bv ); + + for ( j = 0; be->be_suffix[j]; j++ ) { + val.bv_val = be->be_suffix[j]; + val.bv_len = strlen( val.bv_val ); + + attr_merge( e, ad_nc, bv ); + attr_merge( e_database, ad_nc, bv ); + } + + mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 ); + e->e_private = ( void * )mp; + mp->mp_next = e_tmp; + mp->mp_children = NULL; + mp->mp_info = &monitor_subsys[SLAPD_MONITOR_DATABASE]; + mp->mp_flags = monitor_subsys[SLAPD_MONITOR_DATABASE].mss_flags + | MONITOR_F_SUB; + + if ( monitor_cache_add( mi, e ) ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "monitor_subsys_database_init: " + "unable to add entry 'cn=%d,%s'\n", + i, + monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn )); +#else + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_database_init: " + "unable to add entry 'cn=%d,%s'\n%s", + i, + monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn, + "" ); +#endif + return( -1 ); + } + + e_tmp = e; + } + + mp = ( struct monitorentrypriv * )e_database->e_private; + mp->mp_children = e_tmp; + + monitor_cache_release( mi, e_database ); + + return( 0 ); +} + diff --git a/servers/slapd/back-monitor/dummy.c b/servers/slapd/back-monitor/dummy.c new file mode 100644 index 0000000000..74560097c3 --- /dev/null +++ b/servers/slapd/back-monitor/dummy.c @@ -0,0 +1,51 @@ +/* dummy.c - dummy functions for monitor backend */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* + * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Copyright 2001, Pierangelo Masarati, All rights reserved. + * + * This work has beed deveolped for the OpenLDAP Foundation + * in the hope that it may be useful to the Open Source community, + * but WITHOUT ANY WARRANTY. + * + * Permission is granted to anyone to use this software for any purpose + * on any computer system, and to alter it and redistribute it, subject + * to the following restrictions: + * + * 1. The author and SysNet s.n.c. are not responsible for the consequences + * of use of this software, no matter how awful, even if they arise from + * flaws in it. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Since few users ever read sources, + * credits should appear in the documentation. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. Since few users + * ever read sources, credits should appear in the documentation. + * SysNet s.n.c. cannot be responsible for the consequences of the + * alterations. + * + * 4. This notice may not be removed or altered. + */ + +#include "portable.h" + +#include + +#include "slap.h" +#include "back-monitor.h" + +int monitor_back_compare ( BackendDB *bd, + Connection *conn, Operation *op, + const char *dn, const char *ndn, + AttributeAssertion *ava ) +{ + return -1; +} + diff --git a/servers/slapd/back-monitor/entry.c b/servers/slapd/back-monitor/entry.c new file mode 100644 index 0000000000..036a6c511c --- /dev/null +++ b/servers/slapd/back-monitor/entry.c @@ -0,0 +1,98 @@ +/* entry.c - monitor backend entry handling routines */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* + * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Copyright 2001, Pierangelo Masarati, All rights reserved. + * + * This work has beed deveolped for the OpenLDAP Foundation + * in the hope that it may be useful to the Open Source community, + * but WITHOUT ANY WARRANTY. + * + * Permission is granted to anyone to use this software for any purpose + * on any computer system, and to alter it and redistribute it, subject + * to the following restrictions: + * + * 1. The author and SysNet s.n.c. are not responsible for the consequences + * of use of this software, no matter how awful, even if they arise from + * flaws in it. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Since few users ever read sources, + * credits should appear in the documentation. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. Since few users + * ever read sources, credits should appear in the documentation. + * SysNet s.n.c. cannot be responsible for the consequences of the + * alterations. + * + * 4. This notice may not be removed or altered. + */ + +#include "portable.h" + +#include +#include "back-monitor.h" + +int +monitor_entry_update( + struct monitorinfo *mi, + Entry *e +) +{ + struct monitorentrypriv *mp; + + assert( mi != NULL ); + assert( e != NULL ); + assert( e->e_private != NULL ); + + mp = ( struct monitorentrypriv * )e->e_private; + + + if ( mp->mp_info && mp->mp_info->mss_update ) { + return ( *mp->mp_info->mss_update )( mi, e ); + } + + return( 0 ); +} + +int +monitor_entry_create( + struct monitorinfo *mi, + const char *ndn, + Entry *e_parent, + Entry **ep +) +{ + struct monitorentrypriv *mp; + + assert( mi != NULL ); + assert( e_parent != NULL ); + assert( e_parent->e_private != NULL ); + assert( ep != NULL ); + + mp = ( struct monitorentrypriv * )e_parent->e_private; + + if ( mp->mp_info && mp->mp_info->mss_create ) { + return ( *mp->mp_info->mss_create )( mi, ndn, e_parent, ep ); + } + + return( 0 ); +} + +int +monitor_entry_test_flags( + struct monitorentrypriv *mp, + int cond +) +{ + assert( mp != NULL ); + + return( ( mp->mp_flags & cond ) || ( mp->mp_info->mss_flags & cond ) ); +} + diff --git a/servers/slapd/back-monitor/external.h b/servers/slapd/back-monitor/external.h new file mode 100644 index 0000000000..f644744b93 --- /dev/null +++ b/servers/slapd/back-monitor/external.h @@ -0,0 +1,69 @@ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* + * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Copyright 2001, Pierangelo Masarati, All rights reserved. + * + * This work has beed deveolped for the OpenLDAP Foundation + * in the hope that it may be useful to the Open Source community, + * but WITHOUT ANY WARRANTY. + * + * Permission is granted to anyone to use this software for any purpose + * on any computer system, and to alter it and redistribute it, subject + * to the following restrictions: + * + * 1. The author and SysNet s.n.c. are not responsible for the consequences + * of use of this software, no matter how awful, even if they arise from + * flaws in it. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Since few users ever read sources, + * credits should appear in the documentation. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. Since few users + * ever read sources, credits should appear in the documentation. + * SysNet s.n.c. cannot be responsible for the consequences of the + * alterations. + * + * 4. This notice may not be removed or altered. + */ + +#ifndef _MONITOR_EXTERNAL_H +#define _MONITOR_EXTERNAL_H + +LDAP_BEGIN_DECL + +extern int monitor_back_initialize LDAP_P(( BackendInfo *bi )); +extern int monitor_back_db_init LDAP_P(( BackendDB *be )); +extern int monitor_back_open LDAP_P(( BackendInfo *bi )); +extern int monitor_back_config LDAP_P(( BackendInfo *bi, + const char *fname, int lineno, int argc, char **argv )); +extern int monitor_back_db_config LDAP_P(( Backend *be, + const char *fname, int lineno, int argc, char **argv )); + +extern int monitor_back_db_destroy LDAP_P(( BackendDB *be )); + +extern int monitor_back_search LDAP_P(( BackendDB *bd, + Connection *conn, Operation *op, + const char *base, const char *nbase, + int scope, int deref, int sizelimit, int timelimit, + Filter *filter, const char *filterstr, + char **attrs, int attrsonly )); + +extern int monitor_back_compare LDAP_P(( BackendDB *bd, + Connection *conn, Operation *op, + const char *dn, const char *ndn, + AttributeAssertion *ava )); + +extern int monitor_back_abandon LDAP_P(( BackendDB *bd, + Connection *conn, Operation *op, ber_int_t msgid )); + +LDAP_END_DECL + +#endif /* _MONITOR_EXTERNAL_H */ + diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c new file mode 100644 index 0000000000..761090a69f --- /dev/null +++ b/servers/slapd/back-monitor/init.c @@ -0,0 +1,430 @@ +/* init.c - initialize monitor backend */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* + * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Copyright 2001, Pierangelo Masarati, All rights reserved. + * + * This work has beed deveolped for the OpenLDAP Foundation + * in the hope that it may be useful to the Open Source community, + * but WITHOUT ANY WARRANTY. + * + * Permission is granted to anyone to use this software for any purpose + * on any computer system, and to alter it and redistribute it, subject + * to the following restrictions: + * + * 1. The author and SysNet s.n.c. are not responsible for the consequences + * of use of this software, no matter how awful, even if they arise from + * flaws in it. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Since few users ever read sources, + * credits should appear in the documentation. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. Since few users + * ever read sources, credits should appear in the documentation. + * SysNet s.n.c. cannot be responsible for the consequences of the + * alterations. + * + * 4. This notice may not be removed or altered. + */ + +#include "portable.h" + +#include + +#include "slap.h" +#include "back-monitor.h" + +/* + * database monitor can be defined once only + */ +static int monitor_defined = 0; + +/* + * used by many functions to add description to entries + */ +AttributeDescription *monitor_ad_desc = NULL; + +/* + * subsystem data + */ +struct monitorsubsys monitor_subsys[] = { + { + SLAPD_MONITOR_LISTENER, SLAPD_MONITOR_LISTENER_NAME, + NULL, NULL, NULL, + MONITOR_F_NONE, + NULL, /* init */ + NULL, /* update */ + NULL /* create */ + }, { + SLAPD_MONITOR_DATABASE, SLAPD_MONITOR_DATABASE_NAME, + NULL, NULL, NULL, + MONITOR_F_PERSISTENT_CH, + monitor_subsys_database_init, + NULL, /* update */ + NULL /* create */ + }, { + SLAPD_MONITOR_BACKEND, SLAPD_MONITOR_BACKEND_NAME, + NULL, NULL, NULL, + MONITOR_F_PERSISTENT_CH, + monitor_subsys_backend_init, + NULL, /* update */ + NULL /* create */ + }, { + SLAPD_MONITOR_THREAD, SLAPD_MONITOR_THREAD_NAME, + NULL, NULL, NULL, + MONITOR_F_NONE, + NULL, /* init */ + monitor_subsys_thread_update, + NULL /* create */ + }, { + SLAPD_MONITOR_SASL, SLAPD_MONITOR_SASL_NAME, + NULL, NULL, NULL, + MONITOR_F_NONE, + NULL, /* init */ + NULL, /* update */ + NULL /* create */ + }, { + SLAPD_MONITOR_TLS, SLAPD_MONITOR_TLS_NAME, + NULL, NULL, NULL, + MONITOR_F_NONE, + NULL, /* init */ + NULL, /* update */ + NULL /* create */ + }, { + SLAPD_MONITOR_CONN, SLAPD_MONITOR_CONN_NAME, + NULL, NULL, NULL, + MONITOR_F_VOLATILE_CH, + monitor_subsys_conn_init, + monitor_subsys_conn_update, + monitor_subsys_conn_create + }, { + SLAPD_MONITOR_READW, SLAPD_MONITOR_READW_NAME, + NULL, NULL, NULL, + MONITOR_F_NONE, + NULL, /* init */ + monitor_subsys_readw_update, + NULL /* create */ + }, { + SLAPD_MONITOR_WRITEW, SLAPD_MONITOR_WRITEW_NAME, + NULL, NULL, NULL, + MONITOR_F_NONE, + NULL, /* init */ + monitor_subsys_writew_update, + NULL /* create */ + }, { -1, NULL } +}; + +int +monitor_back_initialize( + BackendInfo *bi +) +{ + static char *controls[] = { + LDAP_CONTROL_MANAGEDSAIT, + NULL + }; + + bi->bi_controls = controls; + + bi->bi_init = NULL; + bi->bi_open = monitor_back_open; + bi->bi_config = monitor_back_config; + bi->bi_close = NULL; + bi->bi_destroy = NULL; + + bi->bi_db_init = monitor_back_db_init; + bi->bi_db_config = monitor_back_db_config; + bi->bi_db_open = NULL; + bi->bi_db_close = NULL; + bi->bi_db_destroy = monitor_back_db_destroy; + + bi->bi_op_bind = NULL; + bi->bi_op_unbind = NULL; + bi->bi_op_search = monitor_back_search; + bi->bi_op_compare = monitor_back_compare; + bi->bi_op_modify = NULL; + bi->bi_op_modrdn = NULL; + bi->bi_op_add = NULL; + bi->bi_op_delete = NULL; + bi->bi_op_abandon = monitor_back_abandon; + + bi->bi_extended = NULL; + + bi->bi_entry_release_rw = NULL; + bi->bi_acl_group = NULL; + bi->bi_acl_attribute = NULL; + bi->bi_chk_referrals = NULL; + + /* + * hooks for slap tools + */ + bi->bi_tool_entry_open = NULL; + bi->bi_tool_entry_close = NULL; + bi->bi_tool_entry_first = NULL; + bi->bi_tool_entry_next = NULL; + bi->bi_tool_entry_get = NULL; + bi->bi_tool_entry_put = NULL; + bi->bi_tool_entry_reindex = NULL; + bi->bi_tool_sync = NULL; + + bi->bi_connection_init = 0; + bi->bi_connection_destroy = 0; + + return 0; +} + +int +monitor_back_db_init( + BackendDB *be +) +{ + struct monitorinfo *mi; + Entry *e, *e_tmp; + struct monitorentrypriv *mp; + int i; + char buf[1024]; + const char *text; + + if ( monitor_defined ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "only one monitor backend is allowed\n" )); +#else + Debug( LDAP_DEBUG_ANY, + "only one monitor backend is allowed\n%s%s%s", + "", "", "" ); +#endif + return( -1 ); + } + monitor_defined++; + + charray_add( &be->be_suffix, SLAPD_MONITOR_DN ); + charray_add( &be->be_nsuffix, SLAPD_MONITOR_NDN ); + + mi = ( struct monitorinfo * )ch_calloc( sizeof( struct monitorinfo ), 1 ); + ldap_pvt_thread_mutex_init( &mi->mi_cache_mutex ); + + if ( slap_str2ad( "description", &monitor_ad_desc, &text ) ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "monitor_back_db_init: %s\n", text )); +#else + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_backend_init: %s\n%s%s", + text, "", "" ); +#endif + return( -1 ); + } + + e_tmp = NULL; + for ( i = 0; monitor_subsys[ i ].mss_name != NULL; i++ ) { + int len = strlen( monitor_subsys[ i ].mss_name ); + monitor_subsys[ i ].mss_rdn = ch_calloc( sizeof( char ), + 4 + len ); + strcpy( monitor_subsys[ i ].mss_rdn, "cn=" ); + strcat( monitor_subsys[ i ].mss_rdn, + monitor_subsys[ i ].mss_name ); + + monitor_subsys[ i ].mss_dn = ch_calloc( sizeof( char ), + 4 + len + sizeof( SLAPD_MONITOR_DN ) ); + strcpy( monitor_subsys[ i ].mss_dn, + monitor_subsys[ i ].mss_rdn ); + strcat( monitor_subsys[ i ].mss_dn, "," ); + strcat( monitor_subsys[ i ].mss_dn, SLAPD_MONITOR_DN ); + + monitor_subsys[ i ].mss_ndn + = ch_strdup( monitor_subsys[ i ].mss_dn ); + dn_normalize( monitor_subsys[ i ].mss_ndn ); + + snprintf( buf, sizeof( buf ), + "dn: %s\n" + "objectClass: top\n" + "objectClass: LDAPsubEntry\n" +#ifdef SLAPD_MONITORSUBENTRY + "objectClass: monitorSubEntry\n" +#else /* !SLAPD_MONITORSUBENTRY */ + "objectClass: extensibleObject\n" +#endif /* !SLAPD_MONITORSUBENTRY */ + "cn: %s\n", + monitor_subsys[ i ].mss_dn, + monitor_subsys[ i ].mss_name ); + + e = str2entry( buf ); + + if ( e == NULL) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "unable to create '%s' entry\n", + monitor_subsys[ i ].mss_dn )); +#else + Debug( LDAP_DEBUG_ANY, + "unable to create '%s' entry\n%s%s", + monitor_subsys[ i ].mss_dn, "", "" ); +#endif + return( -1 ); + } + + mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 ); + e->e_private = ( void * )mp; + mp->mp_info = &monitor_subsys[ i ]; + mp->mp_children = NULL; + mp->mp_next = e_tmp; + mp->mp_flags = monitor_subsys[ i ].mss_flags; + + if ( monitor_cache_add( mi, e ) ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "unable to add entry '%s' to cache\n", + monitor_subsys[ i ].mss_dn )); +#else + Debug( LDAP_DEBUG_ANY, + "unable to add entry '%s' to cache\n%s%s", + monitor_subsys[ i ].mss_dn, "", "" ); +#endif + return -1; + } + + e_tmp = e; + } + + /* + * creates the "cn=Monitor" entry + * and all the subsystem specific entries + */ + snprintf( buf, sizeof( buf ), + "dn: %s\n" + "objectClass: top\n" + "objectClass: LDAPsubEntry\n" +#ifdef SLAPD_MONITORSUBENTRY + "objectClass: monitorSubEntry\n" +#else /* !SLAPD_MONITORSUBENTRY */ + "objectClass: extensibleObject\n" +#endif /* !SLAPD_MONITORSUBENTRY */ + "cn: Monitor\n" + "description: %s", + SLAPD_MONITOR_DN, + (char *) Versionstr + ); + e = str2entry( buf ); + if ( e == NULL) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "unable to create '%s' entry\n", + SLAPD_MONITOR_DN )); +#else + Debug( LDAP_DEBUG_ANY, + "unable to create '%s' entry\n%s%s", + SLAPD_MONITOR_DN, "", "" ); +#endif + return( -1 ); + } + + mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 ); + e->e_private = ( void * )mp; + + mp->mp_info = NULL; + mp->mp_children = e_tmp; + mp->mp_next = NULL; + + if ( monitor_cache_add( mi, e ) ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "unable to add entry '%s' to cache\n", + SLAPD_MONITOR_DN )); +#else + Debug( LDAP_DEBUG_ANY, + "unable to add entry '%s' to cache\n%s%s", + SLAPD_MONITOR_DN, "", "" ); +#endif + return -1; + } + + be->be_private = mi; + + return 0; +} + +int +monitor_back_open( + BackendInfo *bi +) +{ + BackendDB *be; + struct monitorsubsys *ms; + + /* + * adds the monitor backend + */ + be = select_backend( SLAPD_MONITOR_NDN, 0 ); + if ( be == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "unable to get monitor backend\n" )); +#else + Debug( LDAP_DEBUG_ANY, + "unable to get monitor backend\n%s%s%s", "", "", "" ); +#endif + return( -1 ); + } + + for ( ms = monitor_subsys; ms->mss_name != NULL; ms++ ) { + if ( ms->mss_init && ( *ms->mss_init )( be ) ) { + return( -1 ); + } + } + + return( 0 ); +} + +int +monitor_back_config( + BackendInfo *bi, + const char *fname, + int lineno, + int argc, + char **argv +) +{ + /* + * eventually, will hold backend specific configuration parameters + */ + return 0; +} + +int +monitor_back_db_config( + Backend *be, + const char *fname, + int lineno, + int argc, + char **argv +) +{ +#ifdef NEW_LOGGING + LDAP_LOG(( "config", LDAP_DEBUG_NOTICE, + "line %d of file '%s' will be ignored\n", lineno, fname )); +#else + Debug( LDAP_DEBUG_CONFIG, + "line %d of file '%s' will be ignored\n%s", lineno, fname, "" ); +#endif + return( 0 ); +} + +int +monitor_back_db_destroy( + BackendDB *be +) +{ + /* + * FIXME: destroys all the data + */ + return 0; +} + diff --git a/servers/slapd/back-monitor/proto-back-monitor.h b/servers/slapd/back-monitor/proto-back-monitor.h new file mode 100644 index 0000000000..d0de827fca --- /dev/null +++ b/servers/slapd/back-monitor/proto-back-monitor.h @@ -0,0 +1,83 @@ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* + * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Copyright 2001, Pierangelo Masarati, All rights reserved. + * + * This work has beed deveolped for the OpenLDAP Foundation + * in the hope that it may be useful to the Open Source community, + * but WITHOUT ANY WARRANTY. + * + * Permission is granted to anyone to use this software for any purpose + * on any computer system, and to alter it and redistribute it, subject + * to the following restrictions: + * + * 1. The author and SysNet s.n.c. are not responsible for the consequences + * of use of this software, no matter how awful, even if they arise from + * flaws in it. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Since few users ever read sources, + * credits should appear in the documentation. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. Since few users + * ever read sources, credits should appear in the documentation. + * SysNet s.n.c. cannot be responsible for the consequences of the + * alterations. + * + * 4. This notice may not be removed or altered. + */ + +#ifndef _PROTO_BACK_LDBM +#define _PROTO_BACK_LDBM + +#include + +#include "external.h" + +LDAP_BEGIN_DECL + +/* + * entry + */ +int monitor_entry_test_flags LDAP_P(( struct monitorentrypriv *mp, int cond )); + +/* + * backends + */ +int monitor_subsys_backend_init LDAP_P(( BackendDB *be )); + +/* + * databases + */ +int monitor_subsys_database_init LDAP_P(( BackendDB *be )); + +/* + * threads + */ +int monitor_subsys_thread_update LDAP_P(( struct monitorinfo *mi, Entry *e )); + +/* + * connections + */ +int monitor_subsys_conn_init LDAP_P(( BackendDB *be )); +int monitor_subsys_conn_update LDAP_P(( struct monitorinfo *mi, Entry *e )); +int monitor_subsys_conn_create LDAP_P(( struct monitorinfo *mi, const char *ndn, Entry *e_parent, Entry **ep )); + +/* + * read waiters + */ +int monitor_subsys_readw_update LDAP_P(( struct monitorinfo *mi, Entry *e )); + +/* + * write waiters + */ +int monitor_subsys_writew_update LDAP_P(( struct monitorinfo *mi, Entry *e )); + +LDAP_END_DECL +#endif diff --git a/servers/slapd/back-monitor/rww.c b/servers/slapd/back-monitor/rww.c new file mode 100644 index 0000000000..e05c45288b --- /dev/null +++ b/servers/slapd/back-monitor/rww.c @@ -0,0 +1,134 @@ +/* readw.c - deal with read waiters subsystem */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* + * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Copyright 2001, Pierangelo Masarati, All rights reserved. + * + * This work has beed deveolped for the OpenLDAP Foundation + * in the hope that it may be useful to the Open Source community, + * but WITHOUT ANY WARRANTY. + * + * Permission is granted to anyone to use this software for any purpose + * on any computer system, and to alter it and redistribute it, subject + * to the following restrictions: + * + * 1. The author and SysNet s.n.c. are not responsible for the consequences + * of use of this software, no matter how awful, even if they arise from + * flaws in it. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Since few users ever read sources, + * credits should appear in the documentation. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. Since few users + * ever read sources, credits should appear in the documentation. + * SysNet s.n.c. cannot be responsible for the consequences of the + * alterations. + * + * 4. This notice may not be removed or altered. + */ + +#include "portable.h" + +#include + +#include "slap.h" +#include "back-monitor.h" + +static int monitor_subsys_readw_update_internal( struct monitorinfo *mi, Entry *e, int rw ); + +int +monitor_subsys_readw_update( + struct monitorinfo *mi, + Entry *e +) +{ + return monitor_subsys_readw_update_internal( mi, e, 0 ); +} + +int +monitor_subsys_writew_update( + struct monitorinfo *mi, + Entry *e +) +{ + return monitor_subsys_readw_update_internal( mi, e, 1 ); +} + +static int +monitor_subsys_readw_update_internal( + struct monitorinfo *mi, + Entry *e, + int rw +) +{ + Connection *c; + int connindex; + int nconns, nwritewaiters, nreadwaiters; + + Attribute *a; + struct berval *bv[2], val, **b = NULL; + char buf[1024]; + + char *str = NULL; + int num = 0; + + bv[0] = &val; + bv[1] = NULL; + + assert( mi != NULL ); + assert( e != NULL ); + + bv[0] = &val; + bv[1] = NULL; + + nconns = nwritewaiters = nreadwaiters = 0; + for ( c = connection_first( &connindex ); + c != NULL; + c = connection_next( c, &connindex ), nconns++ ) { + if ( c->c_writewaiter ) { + nwritewaiters++; + } + if ( c->c_currentber != NULL ) { + nreadwaiters++; + } + } + connection_done(c); + + switch ( rw ) { + case 0: + str = "read waiters"; + num = nreadwaiters; + break; + case 1: + str = "write waiters"; + num = nwritewaiters; + break; + } + snprintf( buf, sizeof( buf ), "%s=%d", str, num ); + + if ( ( a = attr_find( e->e_attrs, monitor_ad_desc ) ) != NULL ) { + for ( b = a->a_vals; b[0] != NULL; b++ ) { + if ( strncmp( b[0]->bv_val, str, strlen( str ) ) == 0 ) { + free( b[0]->bv_val ); + b[0] = ber_bvstrdup( buf ); + break; + } + } + } + + if ( b == NULL || b[0] == NULL ) { + val.bv_val = buf; + val.bv_len = strlen( buf ); + attr_merge( e, monitor_ad_desc, bv ); + } + + return( 0 ); +} + diff --git a/servers/slapd/back-monitor/search.c b/servers/slapd/back-monitor/search.c new file mode 100644 index 0000000000..4df70ae71f --- /dev/null +++ b/servers/slapd/back-monitor/search.c @@ -0,0 +1,195 @@ +/* search.c - monitor backend search function */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* + * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Copyright 2001, Pierangelo Masarati, All rights reserved. + * + * This work has beed deveolped for the OpenLDAP Foundation + * in the hope that it may be useful to the Open Source community, + * but WITHOUT ANY WARRANTY. + * + * Permission is granted to anyone to use this software for any purpose + * on any computer system, and to alter it and redistribute it, subject + * to the following restrictions: + * + * 1. The author and SysNet s.n.c. are not responsible for the consequences + * of use of this software, no matter how awful, even if they arise from + * flaws in it. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Since few users ever read sources, + * credits should appear in the documentation. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. Since few users + * ever read sources, credits should appear in the documentation. + * SysNet s.n.c. cannot be responsible for the consequences of the + * alterations. + * + * 4. This notice may not be removed or altered. + */ + +#include "portable.h" + +#include + +#include +#include + +#include "slap.h" +#include "back-monitor.h" +#include "proto-back-monitor.h" + +static int +monitor_send_children( + Backend *be, + Connection *conn, + Operation *op, + Filter *filter, + char **attrs, + int attrsonly, + Entry *e_parent, + int sub, + int *nentriesp +) +{ + struct monitorinfo *mi = (struct monitorinfo *) be->be_private; + Entry *e, *e_tmp; + struct monitorentrypriv *mp; + int rc; + + mp = ( struct monitorentrypriv * )e_parent->e_private; + e = mp->mp_children; + + if ( e == NULL && MONITOR_HAS_VOLATILE_CH( mp ) ) { + monitor_entry_create( mi, NULL, e_parent, &e ); + if ( e != NULL) { + monitor_cache_lock( e ); + } + } + monitor_cache_release( mi, e_parent ); + + for ( ; e != NULL; ) { + mp = ( struct monitorentrypriv * )e->e_private; + + monitor_entry_update( mi, e ); + + rc = test_filter( be, conn, op, e, filter ); + if ( rc == LDAP_COMPARE_TRUE ) { + send_search_entry( be, conn, op, e, + attrs, attrsonly, NULL ); + *nentriesp++; + } + + if ( ( mp->mp_children || MONITOR_HAS_VOLATILE_CH( mp ) ) + && sub ) { + rc = monitor_send_children( be, conn, op, filter, + attrs, attrsonly, + e, sub, nentriesp ); + if ( rc ) { + return( rc ); + } + } + + e_tmp = mp->mp_next; + if ( e_tmp != NULL ) { + monitor_cache_lock( e_tmp ); + } + monitor_cache_release( mi, e ); + e = e_tmp; + } + + return( 0 ); +} + +int +monitor_back_search( + Backend *be, + Connection *conn, + Operation *op, + const char *base, + const char *nbase, + int scope, + int deref, + int slimit, + int tlimit, + Filter *filter, + const char *filterstr, + char **attrs, + int attrsonly +) +{ + struct monitorinfo *mi = (struct monitorinfo *) be->be_private; + int rc; + Entry *e; + int nentries = 0; + +#ifdef NEW_LOGGING + LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY, + "monitor_back_search: enter\n" )); +#else + Debug(LDAP_DEBUG_TRACE, "=> monitor_back_search\n%s%s%s", "", "", ""); +#endif + + + /* get entry with reader lock */ + monitor_cache_dn2entry( mi, nbase, &e ); + if ( e == NULL ) { + send_ldap_result( conn, op, LDAP_NO_SUCH_OBJECT, + NULL, NULL, NULL, NULL ); + + return( 0 ); + } + + nentries = 0; + switch ( scope ) { + case LDAP_SCOPE_BASE: + monitor_entry_update( mi, e ); + rc = test_filter( be, conn, op, e, filter ); + if ( rc == LDAP_COMPARE_TRUE ) { + send_search_entry( be, conn, op, e, attrs, + attrsonly, NULL ); + nentries = 1; + } + monitor_cache_release( mi, e ); + break; + + case LDAP_SCOPE_ONELEVEL: + rc = monitor_send_children( be, conn, op, filter, + attrs, attrsonly, + e, 0, &nentries ); + if ( rc ) { + // error + } + + break; + + case LDAP_SCOPE_SUBTREE: + monitor_entry_update( mi, e ); + rc = test_filter( be, conn, op, e, filter ); + if ( rc == LDAP_COMPARE_TRUE ) { + send_search_entry( be, conn, op, e, attrs, + attrsonly, NULL ); + nentries++; + } + + rc = monitor_send_children( be, conn, op, filter, + attrs, attrsonly, + e, 1, &nentries ); + if ( rc ) { + // error + } + + break; + } + + send_search_result( conn, op, LDAP_SUCCESS, + NULL, NULL, NULL, NULL, nentries ); + + return( 0 ); +} diff --git a/servers/slapd/back-monitor/thread.c b/servers/slapd/back-monitor/thread.c new file mode 100644 index 0000000000..04b3fb6b6c --- /dev/null +++ b/servers/slapd/back-monitor/thread.c @@ -0,0 +1,81 @@ +/* thread.c - deal with thread subsystem */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* + * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Copyright 2001, Pierangelo Masarati, All rights reserved. + * + * This work has beed deveolped for the OpenLDAP Foundation + * in the hope that it may be useful to the Open Source community, + * but WITHOUT ANY WARRANTY. + * + * Permission is granted to anyone to use this software for any purpose + * on any computer system, and to alter it and redistribute it, subject + * to the following restrictions: + * + * 1. The author and SysNet s.n.c. are not responsible for the consequences + * of use of this software, no matter how awful, even if they arise from + * flaws in it. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Since few users ever read sources, + * credits should appear in the documentation. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. Since few users + * ever read sources, credits should appear in the documentation. + * SysNet s.n.c. cannot be responsible for the consequences of the + * alterations. + * + * 4. This notice may not be removed or altered. + */ + +#include "portable.h" + +#include + +#include "slap.h" +#include "back-monitor.h" + + +int +monitor_subsys_thread_update( + struct monitorinfo *mi, + Entry *e +) +{ + Attribute *a; + struct berval *bv[2], val, **b = NULL; + char buf[1024]; + + bv[0] = &val; + bv[1] = NULL; + + snprintf( buf, sizeof( buf ), "threads=%d", + ldap_pvt_thread_pool_backload( &connection_pool ) ); + + if ( ( a = attr_find( e->e_attrs, monitor_ad_desc ) ) != NULL ) { + + for ( b = a->a_vals; b[0] != NULL; b++ ) { + if ( strncmp( b[0]->bv_val, "threads=", + sizeof( "threads=" ) - 1 ) == 0 ) { + free( b[0]->bv_val ); + b[0] = ber_bvstrdup( buf ); + break; + } + } + } + + if ( b == NULL || b[0] == NULL ) { + val.bv_val = buf; + val.bv_len = strlen( buf ); + attr_merge( e, monitor_ad_desc, bv ); + } + + return( 0 ); +} + diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c index c2edb36275..fa749b85e9 100644 --- a/servers/slapd/backend.c +++ b/servers/slapd/backend.c @@ -33,6 +33,9 @@ #ifdef SLAPD_META #include "back-meta/external.h" #endif +#ifdef SLAPD_MONITOR +#include "back-monitor/external.h" +#endif #ifdef SLAPD_PASSWD #include "back-passwd/external.h" #endif @@ -68,6 +71,9 @@ static BackendInfo binfo[] = { #if defined(SLAPD_META) && !defined(SLAPD_META_DYNAMIC) {"meta", meta_back_initialize}, #endif +#if defined(SLAPD_MONITOR) && !defined(SLAPD_MONITOR_DYNAMIC) + {"monitor", monitor_back_initialize}, +#endif #if defined(SLAPD_PASSWD) && !defined(SLAPD_PASSWD_DYNAMIC) {"passwd", passwd_back_initialize}, #endif diff --git a/servers/slapd/config.c b/servers/slapd/config.c index 88b5db95a3..8aa8393240 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -765,6 +765,21 @@ read_config( const char *fname ) fname, lineno, 0 ); #endif +#if defined(SLAPD_MONITOR_DN) + /* "cn=Monitor" is reserved for monitoring slap */ + } else if ( strcasecmp( cargv[1], SLAPD_MONITOR_DN ) == 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "config", LDAP_LEVEL_CRIT, +"%s: line %d: \"%s\" is reserved for monitoring slapd\n", + SLAPD_MONITOR_DN, fname, lineno )); +#else + Debug( LDAP_DEBUG_ANY, +"%s: line %d: \"%s\" is reserved for monitoring slapd\n", + SLAPD_MONITOR_DN, fname, lineno ); +#endif + return( 1 ); +#endif /* SLAPD_MONITOR_DN */ + } else if ( ( tmp_be = select_backend( cargv[1], 0 ) ) == be ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_INFO, diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c deleted file mode 100644 index 1c337c53b9..0000000000 --- a/servers/slapd/monitor.c +++ /dev/null @@ -1,266 +0,0 @@ -/* $OpenLDAP$ */ -/* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file - */ -/* - * Copyright (c) 1995 Regents of the University of Michigan. - * All rights reserved. - * - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and that due credit is given - * to the University of Michigan at Ann Arbor. The name of the University - * may not be used to endorse or promote products derived from this - * software without specific prior written permission. This software - * is provided ``as is'' without express or implied warranty. - */ - -#include "portable.h" - -#include - -#include -#include -#include - -#include "slap.h" - -#if defined( SLAPD_MONITOR_DN ) - -int -monitor_info( - Entry **entry, - const char **text ) -{ - Entry *e; - char buf[BUFSIZ]; - struct berval val; - struct berval *vals[2]; - int nconns, nwritewaiters, nreadwaiters; - struct tm *ltm; - char *p; - char buf2[22]; - char buf3[22]; - Connection *c; - int connindex; - time_t currenttime; - - vals[0] = &val; - vals[1] = NULL; - - e = (Entry *) ch_calloc( 1, sizeof(Entry) ); - e->e_attrs = NULL; - e->e_dn = ch_strdup( SLAPD_MONITOR_DN ); - e->e_ndn = ch_strdup(SLAPD_MONITOR_DN); - (void) dn_normalize( e->e_ndn ); - e->e_private = NULL; - - val.bv_val = "top"; - val.bv_len = sizeof("top")-1; - attr_merge( e, "objectClass", vals ); - - val.bv_val = "LDAPsubentry"; - val.bv_len = sizeof("LDAPsubentry")-1; - attr_merge( e, "objectClass", vals ); - - val.bv_val = "extensibleObject"; - val.bv_len = sizeof("extensibleObject")-1; - attr_merge( e, "objectClass", vals ); - - { - char *rdn = ch_strdup( SLAPD_MONITOR_DN ); - val.bv_val = strchr( rdn, '=' ); - - if( val.bv_val != NULL ) { - *val.bv_val = '\0'; - val.bv_len = strlen( ++val.bv_val ); - - attr_merge( e, rdn, vals ); - } - - free( rdn ); - } - - val.bv_val = (char *) Versionstr; - if (( p = strchr( Versionstr, '\n' )) == NULL ) { - val.bv_len = strlen( Versionstr ); - } else { - val.bv_len = p - Versionstr; - } - attr_merge( e, "version", vals ); - - sprintf( buf, "%d", - ldap_pvt_thread_pool_backload( &connection_pool) ); - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "threads", vals ); - - nconns = 0; - nwritewaiters = 0; - nreadwaiters = 0; - - /* loop through the connections */ - for ( c = connection_first( &connindex ); - c != NULL; - c = connection_next( c, &connindex )) - { - nconns++; - if ( c->c_writewaiter ) { - nwritewaiters++; - } - if ( c->c_currentber != NULL ) { - nreadwaiters++; - } - - ldap_pvt_thread_mutex_lock( &gmtime_mutex ); - - ltm = gmtime( &c->c_starttime ); - strftime( buf2, sizeof(buf2), "%Y%m%d%H%M%SZ", ltm ); - - ltm = gmtime( &c->c_activitytime ); - strftime( buf3, sizeof(buf2), "%Y%m%d%H%M%SZ", ltm ); - - ldap_pvt_thread_mutex_unlock( &gmtime_mutex ); - - sprintf( buf, - "%ld : %ld " - ": %ld/%ld/%ld/%ld " - ": %ld/%ld/%ld " - ": %s%s%s%s%s%s " - ": %s : %s : %s " - ": %s : %s : %s : %s ", - - c->c_connid, - (long) c->c_protocol, - - c->c_n_ops_received, c->c_n_ops_executing, - c->c_n_ops_pending, c->c_n_ops_completed, - - /* add low-level counters here */ - c->c_n_get, c->c_n_read, c->c_n_write, - - c->c_currentber ? "r" : "", - c->c_writewaiter ? "w" : "", - c->c_ops != NULL ? "x" : "", - c->c_pending_ops != NULL ? "p" : "", - connection_state2str( c->c_conn_state ), - c->c_sasl_bind_in_progress ? "S" : "", - - c->c_cdn ? c->c_cdn : SLAPD_ANONYMOUS, - - c->c_listener_url, - c->c_peer_domain, - c->c_peer_name, - c->c_sock_name, - - buf2, - buf3 - ); - - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "connection", vals ); - } - connection_done(c); - - sprintf( buf, "%d", nconns ); - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "currentConnections", vals ); - - sprintf( buf, "%ld", connections_nextid() ); - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "totalConnections", vals ); - - sprintf( buf, "%ld", (long) dtblsize ); - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "dTableSize", vals ); - - sprintf( buf, "%d", nwritewaiters ); - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "writeWaiters", vals ); - - sprintf( buf, "%d", nreadwaiters ); - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "readWaiters", vals ); - - ldap_pvt_thread_mutex_lock(&num_ops_mutex); - sprintf( buf, "%ld", num_ops_initiated ); - ldap_pvt_thread_mutex_unlock(&num_ops_mutex); - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "opsInitiated", vals ); - - ldap_pvt_thread_mutex_lock(&num_ops_mutex); - sprintf( buf, "%ld", num_ops_completed ); - ldap_pvt_thread_mutex_unlock(&num_ops_mutex); - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "opsCompleted", vals ); - - ldap_pvt_thread_mutex_lock(&num_sent_mutex); - sprintf( buf, "%ld", num_entries_sent ); - ldap_pvt_thread_mutex_unlock(&num_sent_mutex); - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "entriesSent", vals ); - - ldap_pvt_thread_mutex_lock(&num_sent_mutex); - sprintf( buf, "%ld", num_refs_sent ); - ldap_pvt_thread_mutex_unlock(&num_sent_mutex); - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "referencesSent", vals ); - - ldap_pvt_thread_mutex_lock(&num_sent_mutex); - sprintf( buf, "%ld", num_pdu_sent ); - ldap_pvt_thread_mutex_unlock(&num_sent_mutex); - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "pduSent", vals ); - - ldap_pvt_thread_mutex_lock(&num_sent_mutex); - sprintf( buf, "%ld", num_bytes_sent ); - ldap_pvt_thread_mutex_unlock(&num_sent_mutex); - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "bytesSent", vals ); - - currenttime = slap_get_time(); - - ldap_pvt_thread_mutex_lock( &gmtime_mutex ); - ltm = gmtime( ¤ttime ); - strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm ); - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "currenttime", vals ); - - ltm = gmtime( &starttime ); - strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm ); - ldap_pvt_thread_mutex_unlock( &gmtime_mutex ); - - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "starttime", vals ); - - sprintf( buf, "%d", nbackends ); - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "nbackends", vals ); - -#ifdef HAVE_THREAD_CONCURRENCY - sprintf( buf, "%d", ldap_pvt_thread_get_concurrency() ); - val.bv_val = buf; - val.bv_len = strlen( buf ); - attr_merge( e, "concurrency", vals ); -#endif - - *entry = e; - return LDAP_SUCCESS; -} - -#endif /* slapd_monitor_dn */ diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 78c36535b8..e70eff0d7e 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -450,13 +450,10 @@ LDAP_SLAPD_F (void) *module_resolve LDAP_P(( #endif /* SLAPD_MODULES */ /* - * monitor.c + * controls.c */ LDAP_SLAPD_F (char *) supportedControls[]; -LDAP_SLAPD_F (int) monitor_info LDAP_P(( - Entry **entry, const char **text )); - /* * mra.c */ diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema index 8ac639431a..cad13de0c5 100644 --- a/servers/slapd/schema/core.schema +++ b/servers/slapd/schema/core.schema @@ -676,3 +676,22 @@ objectclass ( 1.3.6.1.4.1.4203.666.3.1 NAME 'authPasswordObject' DESC 'OpenLDAP authPassword mixin class' MAY authPassword AUXILIARY ) + +# +# Author: Ando +# Subject: Monitor schema items +# Date: 2001/07/09 +# Status: Work in Progress +# + +# +# monitorSubEntry +# +# Notes: in 'cn' (inherited from 'LDAPsubEntry') it holds the name +# of the subsystem it is monitoring +# +#objectclass ( 1.3.6.1.4.1.4203.666.X.Y.Z +# NAME 'monitorSubEntry' +# DESC 'OpenLDAP ancestor class for system monitoring' +# SUP LDAPsubEntry STRUCTURAL ) + diff --git a/servers/slapd/search.c b/servers/slapd/search.c index 30b8136d29..d37d31653d 100644 --- a/servers/slapd/search.c +++ b/servers/slapd/search.c @@ -213,34 +213,6 @@ do_search( rc = root_dse_info( conn, &entry, &text ); } -#if defined( SLAPD_MONITOR_DN ) - else if ( strcasecmp( nbase, SLAPD_MONITOR_DN ) == 0 ) { - /* check restrictions */ - rc = backend_check_restrictions( NULL, conn, op, NULL, &text ) ; - if( rc != LDAP_SUCCESS ) { - send_ldap_result( conn, op, rc, - NULL, text, NULL, NULL ); - goto return_results; - } - - rc = monitor_info( &entry, &text ); - } -#endif - -#if defined( SLAPD_CONFIG_DN ) - else if ( strcasecmp( nbase, SLAPD_CONFIG_DN ) == 0 ) { - /* check restrictions */ - rc = backend_check_restrictions( NULL, conn, op, NULL, &text ) ; - if( rc != LDAP_SUCCESS ) { - send_ldap_result( conn, op, rc, - NULL, text, NULL, NULL ); - goto return_results; - } - - rc = config_info( &entry, &text ); - } -#endif - #if defined( SLAPD_SCHEMA_DN ) else if ( strcasecmp( nbase, SLAPD_SCHEMA_DN ) == 0 ) { /* check restrictions */ diff --git a/servers/slapd/tools/mimic.c b/servers/slapd/tools/mimic.c index 55ea31cb56..f9af0752ee 100644 --- a/servers/slapd/tools/mimic.c +++ b/servers/slapd/tools/mimic.c @@ -17,6 +17,9 @@ time_t starttime; #endif +/* because Versionstr is used in back-monitor */ +const char Versionstr[] = ""; + /* bogus ../results.c */ int str2result( char* s, @@ -163,6 +166,26 @@ void connection2anonymous( Connection *c ) assert(0); } +Connection * connection_first( ber_socket_t *b ) +{ + assert(0); +} + +Connection * connection_next( Connection *c, ber_socket_t *b ) +{ + assert(0); +} + +void connection_done( Connection *c ) +{ + assert(0); +} + +const char * connection_state2str( int state ) +{ + assert(0); +} + void replog( Backend *be, Operation *op, char *dn, void *change) { assert(0); -- 2.39.5