X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure;h=089564a4b67370d2bc6c123f2008352e9b5e72ac;hb=e5d302e84f70becba45c2d910c0ba99001421ac3;hp=f875f7245acc157a2dfad8e1f7b03635c0bbcf5a;hpb=8577c7893200c766f04975140913bf1ca949ec27;p=openldap
diff --git a/configure b/configure
index f875f7245a..089564a4b6 100755
--- a/configure
+++ b/configure
@@ -1,10 +1,10 @@
#! /bin/sh
# $OpenLDAP$
-# from OpenLDAP: pkg/ldap/configure.in,v 1.508 2004/01/01 18:15:21 kurt Exp
+# from OpenLDAP: pkg/ldap/configure.in,v 1.586 2005/08/07 16:08:02 hallvard Exp
# This work is part of OpenLDAP Software .
#
-# Copyright 1998-2004 The OpenLDAP Foundation.
+# Copyright 1998-2005 The OpenLDAP Foundation.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
# top-level directory of the distribution or, alternatively, at
# .
-echo "Copyright 1998-2004 The OpenLDAP Foundation. All rights reserved."
+echo "Copyright 1998-2005 The OpenLDAP Foundation. All rights reserved."
echo " Restrictions apply, see COPYRIGHT and LICENSE files."
# Guess values for system-dependent variables and create Makefiles.
@@ -44,8 +44,6 @@ ac_help="$ac_help
--enable-ipv6 enable IPv6 support [auto]"
ac_help="$ac_help
--enable-local enable AF_LOCAL (AF_UNIX) socket support [auto]"
-ac_help="$ac_help
- --enable-x-compile enable cross compiling [no]"
ac_help="$ac_help
--with-cyrus-sasl with Cyrus SASL support [auto]"
ac_help="$ac_help
@@ -57,6 +55,10 @@ ac_help="$ac_help
ac_help="$ac_help
--with-yielding-select with implicitly yielding select [auto]"
ac_help="$ac_help
+ --with-multiple-precision
+ multiple precision support for statistics
+ auto|bignum|gmp [auto]"
+ac_help="$ac_help
SLAPD (Standalone LDAP Daemon) Options:"
ac_help="$ac_help
@@ -74,7 +76,7 @@ ac_help="$ac_help
ac_help="$ac_help
--enable-modules enable dynamic module support [no]"
ac_help="$ac_help
- --enable-rewrite enable DN rewriting in back-ldap and back-meta [no]"
+ --enable-rewrite enable DN rewriting in back-ldap and rwm overlay [auto]"
ac_help="$ac_help
--enable-rlookups enable reverse lookups of client hostnames [no]"
ac_help="$ac_help
@@ -84,66 +86,73 @@ ac_help="$ac_help
ac_help="$ac_help
--enable-wrappers enable tcp wrapper support [no]"
ac_help="$ac_help
- --enable-bdb enable Berkeley DB backend [yes]"
+
+SLAPD Backend Options:"
+ac_help="$ac_help
+ --enable-backends enable all available backends no|yes|mod"
ac_help="$ac_help
- --with-bdb-module module type static|dynamic [static]"
+ --enable-bdb enable Berkeley DB backend no|yes|mod [${ol_dflt_backends-yes}]"
ac_help="$ac_help
- --enable-dnssrv enable dnssrv backend [no]"
+ --enable-dnssrv enable dnssrv backend no|yes|mod [${ol_dflt_backends-no}]"
ac_help="$ac_help
- --with-dnssrv-module module type static|dynamic [static]"
+ --enable-hdb enable Hierarchical DB backend no|yes|mod [${ol_dflt_backends-yes}]"
ac_help="$ac_help
- --enable-hdb enable Hierarchical DB backend [no]"
+ --enable-ldap enable ldap backend no|yes|mod [${ol_dflt_backends-no}]"
ac_help="$ac_help
- --with-hdb-module module type static|dynamic [static]"
+ --enable-ldbm enable ldbm backend no|yes|mod [${ol_dflt_backends-no}]"
ac_help="$ac_help
- --enable-ldap enable ldap backend [no]"
+ --with-ldbm-api with LDBM API auto|berkeley|bcompat|mdbm|gdbm [auto]"
ac_help="$ac_help
- --with-ldap-module module type static|dynamic [static]"
+ --with-ldbm-type use LDBM type auto|btree|hash [auto]"
ac_help="$ac_help
- --enable-ldbm enable ldbm backend [no]"
+ --enable-meta enable metadirectory backend no|yes|mod [${ol_dflt_backends-no}]"
ac_help="$ac_help
- --with-ldbm-api with LDBM API auto|berkeley|bcompat|mdbm|gdbm [auto]"
+ --enable-monitor enable monitor backend no|yes|mod [${ol_dflt_backends-yes}]"
ac_help="$ac_help
- --with-ldbm-module module type static|dynamic [static]"
+ --enable-null enable null backend no|yes|mod [${ol_dflt_backends-no}]"
ac_help="$ac_help
- --with-ldbm-type use LDBM type auto|btree|hash [auto]"
+ --enable-passwd enable passwd backend no|yes|mod [${ol_dflt_backends-no}]"
ac_help="$ac_help
- --enable-meta enable metadirectory backend [no]"
+ --enable-perl enable perl backend no|yes|mod [${ol_dflt_backends-no}]"
ac_help="$ac_help
- --with-meta-module module type static|dynamic [static]"
+ --enable-relay enable relay backend no|yes|mod [${ol_dflt_backends-yes}]"
ac_help="$ac_help
- --enable-monitor enable monitor backend [yes]"
+ --enable-shell enable shell backend no|yes|mod [${ol_dflt_backends-no}]"
ac_help="$ac_help
- --with-monitor-module module type static|dynamic [static]"
+ --enable-sql enable sql backend no|yes|mod [${ol_dflt_backends-no}]"
ac_help="$ac_help
- --enable-null enable null backend [no]"
+
+SLAPD Overlay Options:"
ac_help="$ac_help
- --with-null-module module type static|dynamic [static]"
+ --enable-overlays enable all available overlays no|yes|mod"
ac_help="$ac_help
- --enable-passwd enable passwd backend [no]"
+ --enable-accesslog In-Directory Access Logging overlay no|yes|mod [${ol_dflt_overlays-no}]"
ac_help="$ac_help
- --with-passwd-module module type static|dynamic [static]"
+ --enable-denyop Deny Operation overlay no|yes|mod [${ol_dflt_overlays-no}]"
ac_help="$ac_help
- --enable-perl enable perl backend [no]"
+ --enable-dyngroup Dynamic Group overlay no|yes|mod [${ol_dflt_overlays-no}]"
ac_help="$ac_help
- --with-perl-module module type static|dynamic [static]"
+ --enable-dynlist Dynamic List overlay no|yes|mod [${ol_dflt_overlays-no}]"
ac_help="$ac_help
- --enable-shell enable shell backend [no]"
+ --enable-glue Backend Glue overlay no|yes|mod [${ol_dflt_overlays-yes}]"
ac_help="$ac_help
- --with-shell-module module type static|dynamic [static]"
+ --enable-lastmod Last Modification overlay no|yes|mod [${ol_dflt_overlays-no}]"
ac_help="$ac_help
- --enable-sql enable sql backend [no]"
+ --enable-ppolicy Password Policy overlay no|yes|mod [${ol_dflt_overlays-no}]"
ac_help="$ac_help
- --with-sql-module module type static|dynamic [static]"
+ --enable-proxycache Proxy Cache overlay no|yes|mod [${ol_dflt_overlays-no}]"
ac_help="$ac_help
-
-SLAPD Overlay Options:"
+ --enable-refint Referential Integrity overlay no|yes|mod [${ol_dflt_overlays-no}]"
ac_help="$ac_help
- --with-dyngroup Dynamic Group overlay no|yes|mod [no]"
+ --enable-retcode Return Code testing overlay no|yes|mod [${ol_dflt_overlays-no}]"
ac_help="$ac_help
- --with-proxycache Proxy Cache overlay no|yes|mod [no]"
+ --enable-rwm Rewrite/Remap overlay no|yes|mod [${ol_dflt_overlays-no}]"
ac_help="$ac_help
- --with-rwm Rewrite/Remap overlay no|yes|mod [no]"
+ --enable-syncprov Syncrepl Provider overlay no|yes|mod [${ol_dflt_overlays-yes}]"
+ac_help="$ac_help
+ --enable-translucent Translucent Proxy overlay no|yes|mod [${ol_dflt_overlays-no}]"
+ac_help="$ac_help
+ --enable-unique Attribute Uniqueness overlay no|yes|mod [${ol_dflt_overlays-no}]"
ac_help="$ac_help
SLURPD (Replication Daemon) Options:"
@@ -886,7 +895,7 @@ echo "Configuring ${TB}${OL_STRING}${TN} ${OPENLDAP_CVS}..."
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:890: checking host system type" >&5
+echo "configure:899: 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.
@@ -927,7 +936,7 @@ host_os=$ac_cv_host_os
echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:931: checking target system type" >&5
+echo "configure:940: 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.
@@ -967,7 +976,7 @@ target_os=$ac_cv_target_os
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:971: checking build system type" >&5
+echo "configure:980: 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.
@@ -1044,7 +1053,7 @@ test "$host_alias" != "$target_alias" &&
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1048: checking for a BSD compatible install" >&5
+echo "configure:1057: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"\${ac_cv_path_install+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1101,7 +1110,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:1105: checking whether build environment is sane" >&5
+echo "configure:1114: checking whether build environment is sane" >&5
# Just in case
sleep 1
echo timestamp > conftestfile
@@ -1162,7 +1171,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1166: checking for $ac_word" >&5
+echo "configure:1175: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_AWK+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1192,7 +1201,7 @@ test -n "$AWK" && break
done
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1196: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1205: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1232,7 +1241,7 @@ fi
missing_dir=`cd $ac_aux_dir && pwd`
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:1236: checking for working aclocal" >&5
+echo "configure:1245: 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.
@@ -1245,7 +1254,7 @@ else
fi
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1249: checking for working autoconf" >&5
+echo "configure:1258: 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.
@@ -1258,7 +1267,7 @@ else
fi
echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:1262: checking for working automake" >&5
+echo "configure:1271: 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.
@@ -1271,7 +1280,7 @@ else
fi
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1275: checking for working autoheader" >&5
+echo "configure:1284: 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.
@@ -1284,7 +1293,7 @@ else
fi
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1288: checking for working makeinfo" >&5
+echo "configure:1297: 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.
@@ -1304,7 +1313,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1308: checking for $ac_word" >&5
+echo "configure:1317: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_AMTAR+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1367,14 +1376,16 @@ cat >> confdefs.h <&6
-echo "configure:1378: checking configure arguments" >&5
+echo "configure:1389: checking configure arguments" >&5
top_builddir=`pwd`
@@ -1522,26 +1533,6 @@ else
ol_enable_local="auto"
fi
# end --enable-local
-# OpenLDAP --enable-x_compile
- # Check whether --enable-x_compile or --disable-x_compile was given.
-if test "${enable_x_compile+set}" = set; then
- enableval="$enable_x_compile"
-
- ol_arg=invalid
- for ol_val in 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-x_compile" 1>&2; exit 1; }
- fi
- ol_enable_x_compile="$ol_arg"
-
-else
- ol_enable_x_compile="no"
-fi
-# end --enable-x_compile
# OpenLDAP --with-cyrus_sasl
@@ -1650,6 +1641,27 @@ else
fi
# end --with-yielding_select
+# OpenLDAP --with-multiple_precision
+ # Check whether --with-multiple_precision or --without-multiple_precision was given.
+if test "${with_multiple_precision+set}" = set; then
+ withval="$with_multiple_precision"
+
+ ol_arg=invalid
+ for ol_val in auto bignum gmp yes no ; 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-multiple_precision" 1>&2; exit 1; }
+ fi
+ ol_with_multiple_precision="$ol_arg"
+
+else
+ ol_with_multiple_precision="auto"
+fi
+# end --with-multiple_precision
+
# Check whether --with-xxslapdoptions or --without-xxslapdoptions was given.
@@ -1738,7 +1750,6 @@ else
ol_enable_crypt="no"
fi
# end --enable-crypt
-ol_enable_kpasswd=${ol_enable_kpasswd-no}
# OpenLDAP --enable-lmpasswd
# Check whether --enable-lmpasswd or --disable-lmpasswd was given.
if test "${enable_lmpasswd+set}" = set; then
@@ -1817,7 +1828,7 @@ if test "${enable_rewrite+set}" = set; then
ol_enable_rewrite="$ol_arg"
else
- ol_enable_rewrite="no"
+ ol_enable_rewrite="auto"
fi
# end --enable-rewrite
# OpenLDAP --enable-rlookups
@@ -1901,55 +1912,62 @@ else
fi
# end --enable-wrappers
+Backends="bdb dnssrv hdb ldap ldbm meta monitor null \
+ passwd perl relay shell sql"
-# OpenLDAP --enable-bdb
- # Check whether --enable-bdb or --disable-bdb was given.
-if test "${enable_bdb+set}" = set; then
- enableval="$enable_bdb"
+# Check whether --with-xxslapbackends or --without-xxslapbackends was given.
+if test "${with_xxslapbackends+set}" = set; then
+ withval="$with_xxslapbackends"
+ :
+fi
+
+
+# OpenLDAP --enable-backends
+ # Check whether --enable-backends or --disable-backends was given.
+if test "${enable_backends+set}" = set; then
+ enableval="$enable_backends"
ol_arg=invalid
- for ol_val in auto yes no ; do
+ for ol_val in no yes mod ; 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-bdb" 1>&2; exit 1; }
+ { echo "configure: error: bad value $enableval for --enable-backends" 1>&2; exit 1; }
fi
- ol_enable_bdb="$ol_arg"
+ ol_enable_backends="$ol_arg"
-else
- ol_enable_bdb="yes"
fi
-# end --enable-bdb
-# OpenLDAP --with-bdb_module
- # Check whether --with-bdb_module or --without-bdb_module was given.
-if test "${with_bdb_module+set}" = set; then
- withval="$with_bdb_module"
+# end --enable-backends
+test -n "$ol_enable_backends" && ol_dflt_backends="$ol_enable_backends"
+# OpenLDAP --enable-bdb
+ # Check whether --enable-bdb or --disable-bdb was given.
+if test "${enable_bdb+set}" = set; then
+ enableval="$enable_bdb"
ol_arg=invalid
- for ol_val in static dynamic ; do
- if test "$withval" = "$ol_val" ; then
+ for ol_val in no yes mod ; do
+ if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
done
if test "$ol_arg" = "invalid" ; then
- { echo "configure: error: bad value $withval for --with-bdb_module" 1>&2; exit 1; }
+ { echo "configure: error: bad value $enableval for --enable-bdb" 1>&2; exit 1; }
fi
- ol_with_bdb_module="$ol_arg"
+ ol_enable_bdb="$ol_arg"
else
- ol_with_bdb_module="static"
+ ol_enable_bdb="${ol_dflt_backends-yes}"
fi
-# end --with-bdb_module
-
+# end --enable-bdb
# OpenLDAP --enable-dnssrv
# Check whether --enable-dnssrv or --disable-dnssrv was given.
if test "${enable_dnssrv+set}" = set; then
enableval="$enable_dnssrv"
ol_arg=invalid
- for ol_val in auto yes no ; do
+ for ol_val in no yes mod ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
@@ -1960,37 +1978,16 @@ if test "${enable_dnssrv+set}" = set; then
ol_enable_dnssrv="$ol_arg"
else
- ol_enable_dnssrv="no"
+ ol_enable_dnssrv="${ol_dflt_backends-no}"
fi
# end --enable-dnssrv
-# OpenLDAP --with-dnssrv_module
- # Check whether --with-dnssrv_module or --without-dnssrv_module was given.
-if test "${with_dnssrv_module+set}" = set; then
- withval="$with_dnssrv_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-dnssrv_module" 1>&2; exit 1; }
- fi
- ol_with_dnssrv_module="$ol_arg"
-
-else
- ol_with_dnssrv_module="static"
-fi
-# end --with-dnssrv_module
-
# OpenLDAP --enable-hdb
# Check whether --enable-hdb or --disable-hdb was given.
if test "${enable_hdb+set}" = set; then
enableval="$enable_hdb"
ol_arg=invalid
- for ol_val in auto yes no ; do
+ for ol_val in no yes mod ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
@@ -2001,37 +1998,16 @@ if test "${enable_hdb+set}" = set; then
ol_enable_hdb="$ol_arg"
else
- ol_enable_hdb="no"
+ ol_enable_hdb="${ol_dflt_backends-yes}"
fi
# end --enable-hdb
-# OpenLDAP --with-hdb_module
- # Check whether --with-hdb_module or --without-hdb_module was given.
-if test "${with_hdb_module+set}" = set; then
- withval="$with_hdb_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-hdb_module" 1>&2; exit 1; }
- fi
- ol_with_hdb_module="$ol_arg"
-
-else
- ol_with_hdb_module="static"
-fi
-# end --with-hdb_module
-
# OpenLDAP --enable-ldap
# Check whether --enable-ldap or --disable-ldap was given.
if test "${enable_ldap+set}" = set; then
enableval="$enable_ldap"
ol_arg=invalid
- for ol_val in auto yes no ; do
+ for ol_val in no yes mod ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
@@ -2042,37 +2018,16 @@ if test "${enable_ldap+set}" = set; then
ol_enable_ldap="$ol_arg"
else
- ol_enable_ldap="no"
+ ol_enable_ldap="${ol_dflt_backends-no}"
fi
# end --enable-ldap
-# OpenLDAP --with-ldap_module
- # Check whether --with-ldap_module or --without-ldap_module was given.
-if test "${with_ldap_module+set}" = set; then
- withval="$with_ldap_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-ldap_module" 1>&2; exit 1; }
- fi
- ol_with_ldap_module="$ol_arg"
-
-else
- ol_with_ldap_module="static"
-fi
-# end --with-ldap_module
-
# OpenLDAP --enable-ldbm
# Check whether --enable-ldbm or --disable-ldbm was given.
if test "${enable_ldbm+set}" = set; then
enableval="$enable_ldbm"
ol_arg=invalid
- for ol_val in auto yes no ; do
+ for ol_val in no yes mod ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
@@ -2083,7 +2038,7 @@ if test "${enable_ldbm+set}" = set; then
ol_enable_ldbm="$ol_arg"
else
- ol_enable_ldbm="no"
+ ol_enable_ldbm="${ol_dflt_backends-no}"
fi
# end --enable-ldbm
# OpenLDAP --with-ldbm_api
@@ -2107,27 +2062,6 @@ else
fi
# end --with-ldbm_api
-# OpenLDAP --with-ldbm_module
- # Check whether --with-ldbm_module or --without-ldbm_module was given.
-if test "${with_ldbm_module+set}" = set; then
- withval="$with_ldbm_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-ldbm_module" 1>&2; exit 1; }
- fi
- ol_with_ldbm_module="$ol_arg"
-
-else
- ol_with_ldbm_module="static"
-fi
-# end --with-ldbm_module
-
# OpenLDAP --with-ldbm_type
# Check whether --with-ldbm_type or --without-ldbm_type was given.
if test "${with_ldbm_type+set}" = set; then
@@ -2155,7 +2089,7 @@ if test "${enable_meta+set}" = set; then
enableval="$enable_meta"
ol_arg=invalid
- for ol_val in auto yes no ; do
+ for ol_val in no yes mod ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
@@ -2166,37 +2100,16 @@ if test "${enable_meta+set}" = set; then
ol_enable_meta="$ol_arg"
else
- ol_enable_meta="no"
+ ol_enable_meta="${ol_dflt_backends-no}"
fi
# end --enable-meta
-# OpenLDAP --with-meta_module
- # Check whether --with-meta_module or --without-meta_module was given.
-if test "${with_meta_module+set}" = set; then
- withval="$with_meta_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-meta_module" 1>&2; exit 1; }
- fi
- ol_with_meta_module="$ol_arg"
-
-else
- ol_with_meta_module="static"
-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
+ for ol_val in no yes mod ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
@@ -2207,37 +2120,16 @@ if test "${enable_monitor+set}" = set; then
ol_enable_monitor="$ol_arg"
else
- ol_enable_monitor="yes"
+ ol_enable_monitor="${ol_dflt_backends-yes}"
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-null
# Check whether --enable-null or --disable-null was given.
if test "${enable_null+set}" = set; then
enableval="$enable_null"
ol_arg=invalid
- for ol_val in auto yes no ; do
+ for ol_val in no yes mod ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
@@ -2248,37 +2140,16 @@ if test "${enable_null+set}" = set; then
ol_enable_null="$ol_arg"
else
- ol_enable_null="no"
+ ol_enable_null="${ol_dflt_backends-no}"
fi
# end --enable-null
-# OpenLDAP --with-null_module
- # Check whether --with-null_module or --without-null_module was given.
-if test "${with_null_module+set}" = set; then
- withval="$with_null_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-null_module" 1>&2; exit 1; }
- fi
- ol_with_null_module="$ol_arg"
-
-else
- ol_with_null_module="static"
-fi
-# end --with-null_module
-
# OpenLDAP --enable-passwd
# Check whether --enable-passwd or --disable-passwd was given.
if test "${enable_passwd+set}" = set; then
enableval="$enable_passwd"
ol_arg=invalid
- for ol_val in auto yes no ; do
+ for ol_val in no yes mod ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
@@ -2289,37 +2160,16 @@ if test "${enable_passwd+set}" = set; then
ol_enable_passwd="$ol_arg"
else
- ol_enable_passwd="no"
+ ol_enable_passwd="${ol_dflt_backends-no}"
fi
# end --enable-passwd
-# OpenLDAP --with-passwd_module
- # Check whether --with-passwd_module or --without-passwd_module was given.
-if test "${with_passwd_module+set}" = set; then
- withval="$with_passwd_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-passwd_module" 1>&2; exit 1; }
- fi
- ol_with_passwd_module="$ol_arg"
-
-else
- ol_with_passwd_module="static"
-fi
-# end --with-passwd_module
-
# OpenLDAP --enable-perl
# Check whether --enable-perl or --disable-perl was given.
if test "${enable_perl+set}" = set; then
enableval="$enable_perl"
ol_arg=invalid
- for ol_val in auto yes no ; do
+ for ol_val in no yes mod ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
@@ -2330,37 +2180,36 @@ if test "${enable_perl+set}" = set; then
ol_enable_perl="$ol_arg"
else
- ol_enable_perl="no"
+ ol_enable_perl="${ol_dflt_backends-no}"
fi
# end --enable-perl
-# OpenLDAP --with-perl_module
- # Check whether --with-perl_module or --without-perl_module was given.
-if test "${with_perl_module+set}" = set; then
- withval="$with_perl_module"
+# OpenLDAP --enable-relay
+ # Check whether --enable-relay or --disable-relay was given.
+if test "${enable_relay+set}" = set; then
+ enableval="$enable_relay"
ol_arg=invalid
- for ol_val in static dynamic ; do
- if test "$withval" = "$ol_val" ; then
+ for ol_val in no yes mod ; do
+ if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
done
if test "$ol_arg" = "invalid" ; then
- { echo "configure: error: bad value $withval for --with-perl_module" 1>&2; exit 1; }
+ { echo "configure: error: bad value $enableval for --enable-relay" 1>&2; exit 1; }
fi
- ol_with_perl_module="$ol_arg"
+ ol_enable_relay="$ol_arg"
else
- ol_with_perl_module="static"
+ ol_enable_relay="${ol_dflt_backends-yes}"
fi
-# end --with-perl_module
-
+# end --enable-relay
# OpenLDAP --enable-shell
# Check whether --enable-shell or --disable-shell was given.
if test "${enable_shell+set}" = set; then
enableval="$enable_shell"
ol_arg=invalid
- for ol_val in auto yes no ; do
+ for ol_val in no yes mod ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
@@ -2371,171 +2220,384 @@ if test "${enable_shell+set}" = set; then
ol_enable_shell="$ol_arg"
else
- ol_enable_shell="no"
+ ol_enable_shell="${ol_dflt_backends-no}"
fi
# end --enable-shell
-# OpenLDAP --with-shell_module
- # Check whether --with-shell_module or --without-shell_module was given.
-if test "${with_shell_module+set}" = set; then
- withval="$with_shell_module"
+# OpenLDAP --enable-sql
+ # Check whether --enable-sql or --disable-sql was given.
+if test "${enable_sql+set}" = set; then
+ enableval="$enable_sql"
ol_arg=invalid
- for ol_val in static dynamic ; do
- if test "$withval" = "$ol_val" ; then
+ for ol_val in no yes mod ; do
+ if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
done
if test "$ol_arg" = "invalid" ; then
- { echo "configure: error: bad value $withval for --with-shell_module" 1>&2; exit 1; }
+ { echo "configure: error: bad value $enableval for --enable-sql" 1>&2; exit 1; }
fi
- ol_with_shell_module="$ol_arg"
+ ol_enable_sql="$ol_arg"
else
- ol_with_shell_module="static"
+ ol_enable_sql="${ol_dflt_backends-no}"
fi
-# end --with-shell_module
+# end --enable-sql
-# OpenLDAP --enable-sql
- # Check whether --enable-sql or --disable-sql was given.
-if test "${enable_sql+set}" = set; then
- enableval="$enable_sql"
+Overlays="accesslog denyop dyngroup dynlist glue lastmod ppolicy proxycache \
+ refint retcode rwm syncprov translucent unique"
+
+# Check whether --with-xxslapoverlays or --without-xxslapoverlays was given.
+if test "${with_xxslapoverlays+set}" = set; then
+ withval="$with_xxslapoverlays"
+ :
+fi
+
+
+# OpenLDAP --enable-overlays
+ # Check whether --enable-overlays or --disable-overlays was given.
+if test "${enable_overlays+set}" = set; then
+ enableval="$enable_overlays"
ol_arg=invalid
- for ol_val in auto yes no ; do
+ for ol_val in no yes mod ; 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-sql" 1>&2; exit 1; }
+ { echo "configure: error: bad value $enableval for --enable-overlays" 1>&2; exit 1; }
fi
- ol_enable_sql="$ol_arg"
+ ol_enable_overlays="$ol_arg"
-else
- ol_enable_sql="no"
fi
-# end --enable-sql
-# OpenLDAP --with-sql_module
- # Check whether --with-sql_module or --without-sql_module was given.
-if test "${with_sql_module+set}" = set; then
- withval="$with_sql_module"
+# end --enable-overlays
+test -n "$ol_enable_overlays" && ol_dflt_overlays="$ol_enable_overlays"
+# OpenLDAP --enable-accesslog
+ # Check whether --enable-accesslog or --disable-accesslog was given.
+if test "${enable_accesslog+set}" = set; then
+ enableval="$enable_accesslog"
ol_arg=invalid
- for ol_val in static dynamic ; do
- if test "$withval" = "$ol_val" ; then
+ for ol_val in no yes mod ; do
+ if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
done
if test "$ol_arg" = "invalid" ; then
- { echo "configure: error: bad value $withval for --with-sql_module" 1>&2; exit 1; }
+ { echo "configure: error: bad value $enableval for --enable-accesslog" 1>&2; exit 1; }
fi
- ol_with_sql_module="$ol_arg"
+ ol_enable_accesslog="$ol_arg"
else
- ol_with_sql_module="static"
+ ol_enable_accesslog="${ol_dflt_overlays-no}"
fi
-# end --with-sql_module
+# end --enable-accesslog
+# OpenLDAP --enable-denyop
+ # Check whether --enable-denyop or --disable-denyop was given.
+if test "${enable_denyop+set}" = set; then
+ enableval="$enable_denyop"
+
+ ol_arg=invalid
+ for ol_val in no yes mod ; 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-denyop" 1>&2; exit 1; }
+ fi
+ ol_enable_denyop="$ol_arg"
-# Check whether --with-xxslapoverlays or --without-xxslapoverlays was given.
-if test "${with_xxslapoverlays+set}" = set; then
- withval="$with_xxslapoverlays"
- :
+else
+ ol_enable_denyop="${ol_dflt_overlays-no}"
fi
+# end --enable-denyop
-# OpenLDAP --with-dyngroup
- # Check whether --with-dyngroup or --without-dyngroup was given.
-if test "${with_dyngroup+set}" = set; then
- withval="$with_dyngroup"
+# OpenLDAP --enable-dyngroup
+ # Check whether --enable-dyngroup or --disable-dyngroup was given.
+if test "${enable_dyngroup+set}" = set; then
+ enableval="$enable_dyngroup"
ol_arg=invalid
for ol_val in no yes mod ; do
- if test "$withval" = "$ol_val" ; then
+ if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
done
if test "$ol_arg" = "invalid" ; then
- { echo "configure: error: bad value $withval for --with-dyngroup" 1>&2; exit 1; }
+ { echo "configure: error: bad value $enableval for --enable-dyngroup" 1>&2; exit 1; }
fi
- ol_with_dyngroup="$ol_arg"
+ ol_enable_dyngroup="$ol_arg"
else
- ol_with_dyngroup="no"
+ ol_enable_dyngroup="${ol_dflt_overlays-no}"
fi
-# end --with-dyngroup
+# end --enable-dyngroup
-# OpenLDAP --with-proxycache
- # Check whether --with-proxycache or --without-proxycache was given.
-if test "${with_proxycache+set}" = set; then
- withval="$with_proxycache"
+# OpenLDAP --enable-dynlist
+ # Check whether --enable-dynlist or --disable-dynlist was given.
+if test "${enable_dynlist+set}" = set; then
+ enableval="$enable_dynlist"
ol_arg=invalid
for ol_val in no yes mod ; do
- if test "$withval" = "$ol_val" ; then
+ if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
done
if test "$ol_arg" = "invalid" ; then
- { echo "configure: error: bad value $withval for --with-proxycache" 1>&2; exit 1; }
+ { echo "configure: error: bad value $enableval for --enable-dynlist" 1>&2; exit 1; }
fi
- ol_with_proxycache="$ol_arg"
+ ol_enable_dynlist="$ol_arg"
else
- ol_with_proxycache="no"
+ ol_enable_dynlist="${ol_dflt_overlays-no}"
fi
-# end --with-proxycache
+# end --enable-dynlist
-# OpenLDAP --with-rwm
- # Check whether --with-rwm or --without-rwm was given.
-if test "${with_rwm+set}" = set; then
- withval="$with_rwm"
+# OpenLDAP --enable-glue
+ # Check whether --enable-glue or --disable-glue was given.
+if test "${enable_glue+set}" = set; then
+ enableval="$enable_glue"
ol_arg=invalid
for ol_val in no yes mod ; do
- if test "$withval" = "$ol_val" ; then
+ if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
done
if test "$ol_arg" = "invalid" ; then
- { echo "configure: error: bad value $withval for --with-rwm" 1>&2; exit 1; }
+ { echo "configure: error: bad value $enableval for --enable-glue" 1>&2; exit 1; }
fi
- ol_with_rwm="$ol_arg"
+ ol_enable_glue="$ol_arg"
else
- ol_with_rwm="no"
+ ol_enable_glue="${ol_dflt_overlays-yes}"
fi
-# end --with-rwm
+# end --enable-glue
+# OpenLDAP --enable-lastmod
+ # Check whether --enable-lastmod or --disable-lastmod was given.
+if test "${enable_lastmod+set}" = set; then
+ enableval="$enable_lastmod"
+
+ ol_arg=invalid
+ for ol_val in no yes mod ; 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-lastmod" 1>&2; exit 1; }
+ fi
+ ol_enable_lastmod="$ol_arg"
-# Check whether --with-xxslurpdoptions or --without-xxslurpdoptions was given.
-if test "${with_xxslurpdoptions+set}" = set; then
- withval="$with_xxslurpdoptions"
- :
+else
+ ol_enable_lastmod="${ol_dflt_overlays-no}"
fi
+# end --enable-lastmod
-# OpenLDAP --enable-slurpd
- # Check whether --enable-slurpd or --disable-slurpd was given.
-if test "${enable_slurpd+set}" = set; then
- enableval="$enable_slurpd"
+# OpenLDAP --enable-ppolicy
+ # Check whether --enable-ppolicy or --disable-ppolicy was given.
+if test "${enable_ppolicy+set}" = set; then
+ enableval="$enable_ppolicy"
ol_arg=invalid
- for ol_val in auto yes no ; do
+ for ol_val in no yes mod ; 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-slurpd" 1>&2; exit 1; }
+ { echo "configure: error: bad value $enableval for --enable-ppolicy" 1>&2; exit 1; }
fi
- ol_enable_slurpd="$ol_arg"
+ ol_enable_ppolicy="$ol_arg"
else
- ol_enable_slurpd="auto"
+ ol_enable_ppolicy="${ol_dflt_overlays-no}"
fi
-# end --enable-slurpd
+# end --enable-ppolicy
-# Check whether --with-xxliboptions or --without-xxliboptions was given.
-if test "${with_xxliboptions+set}" = set; then
+# OpenLDAP --enable-proxycache
+ # Check whether --enable-proxycache or --disable-proxycache was given.
+if test "${enable_proxycache+set}" = set; then
+ enableval="$enable_proxycache"
+
+ ol_arg=invalid
+ for ol_val in no yes mod ; 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-proxycache" 1>&2; exit 1; }
+ fi
+ ol_enable_proxycache="$ol_arg"
+
+else
+ ol_enable_proxycache="${ol_dflt_overlays-no}"
+fi
+# end --enable-proxycache
+
+# OpenLDAP --enable-refint
+ # Check whether --enable-refint or --disable-refint was given.
+if test "${enable_refint+set}" = set; then
+ enableval="$enable_refint"
+
+ ol_arg=invalid
+ for ol_val in no yes mod ; 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-refint" 1>&2; exit 1; }
+ fi
+ ol_enable_refint="$ol_arg"
+
+else
+ ol_enable_refint="${ol_dflt_overlays-no}"
+fi
+# end --enable-refint
+
+# OpenLDAP --enable-retcode
+ # Check whether --enable-retcode or --disable-retcode was given.
+if test "${enable_retcode+set}" = set; then
+ enableval="$enable_retcode"
+
+ ol_arg=invalid
+ for ol_val in no yes mod ; 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-retcode" 1>&2; exit 1; }
+ fi
+ ol_enable_retcode="$ol_arg"
+
+else
+ ol_enable_retcode="${ol_dflt_overlays-no}"
+fi
+# end --enable-retcode
+
+# OpenLDAP --enable-rwm
+ # Check whether --enable-rwm or --disable-rwm was given.
+if test "${enable_rwm+set}" = set; then
+ enableval="$enable_rwm"
+
+ ol_arg=invalid
+ for ol_val in no yes mod ; 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-rwm" 1>&2; exit 1; }
+ fi
+ ol_enable_rwm="$ol_arg"
+
+else
+ ol_enable_rwm="${ol_dflt_overlays-no}"
+fi
+# end --enable-rwm
+
+# OpenLDAP --enable-syncprov
+ # Check whether --enable-syncprov or --disable-syncprov was given.
+if test "${enable_syncprov+set}" = set; then
+ enableval="$enable_syncprov"
+
+ ol_arg=invalid
+ for ol_val in no yes mod ; 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-syncprov" 1>&2; exit 1; }
+ fi
+ ol_enable_syncprov="$ol_arg"
+
+else
+ ol_enable_syncprov="${ol_dflt_overlays-yes}"
+fi
+# end --enable-syncprov
+
+# OpenLDAP --enable-translucent
+ # Check whether --enable-translucent or --disable-translucent was given.
+if test "${enable_translucent+set}" = set; then
+ enableval="$enable_translucent"
+
+ ol_arg=invalid
+ for ol_val in no yes mod ; 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-translucent" 1>&2; exit 1; }
+ fi
+ ol_enable_translucent="$ol_arg"
+
+else
+ ol_enable_translucent="${ol_dflt_overlays-no}"
+fi
+# end --enable-translucent
+
+# OpenLDAP --enable-unique
+ # Check whether --enable-unique or --disable-unique was given.
+if test "${enable_unique+set}" = set; then
+ enableval="$enable_unique"
+
+ ol_arg=invalid
+ for ol_val in no yes mod ; 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-unique" 1>&2; exit 1; }
+ fi
+ ol_enable_unique="$ol_arg"
+
+else
+ ol_enable_unique="${ol_dflt_overlays-no}"
+fi
+# end --enable-unique
+
+
+
+# Check whether --with-xxslurpdoptions or --without-xxslurpdoptions was given.
+if test "${with_xxslurpdoptions+set}" = set; then
+ withval="$with_xxslurpdoptions"
+ :
+fi
+
+# OpenLDAP --enable-slurpd
+ # Check whether --enable-slurpd or --disable-slurpd was given.
+if test "${enable_slurpd+set}" = set; then
+ enableval="$enable_slurpd"
+
+ 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-slurpd" 1>&2; exit 1; }
+ fi
+ ol_enable_slurpd="$ol_arg"
+
+else
+ ol_enable_slurpd="auto"
+fi
+# end --enable-slurpd
+
+# Check whether --with-xxliboptions or --without-xxliboptions was given.
+if test "${with_xxliboptions+set}" = set; then
withval="$with_xxliboptions"
:
fi
@@ -2593,42 +2655,16 @@ if test $ol_enable_slapd = no ; then
if test $ol_enable_slapi = yes ; then
echo "configure: warning: slapd disabled, ignoring --enable-slapi argument" 1>&2
fi
- if test $ol_enable_bdb = yes ; then
- echo "configure: warning: slapd disabled, ignoring --enable-bdb argument" 1>&2
- fi
- if test $ol_enable_dnssrv = yes ; then
- echo "configure: warning: slapd disabled, ignoring --enable-dnssrv argument" 1>&2
- fi
- if test $ol_enable_hdb = yes ; then
- echo "configure: warning: slapd disabled, ignoring --enable-hdb argument" 1>&2
- fi
- if test $ol_enable_ldap = yes ; then
- echo "configure: warning: slapd disabled, ignoring --enable-ldap argument" 1>&2
- fi
- if test $ol_enable_ldbm = yes ; then
- echo "configure: warning: slapd disabled, ignoring --enable-ldbm argument" 1>&2
- fi
- if test $ol_enable_meta = yes ; then
- echo "configure: warning: slapd disabled, ignoring --enable-meta argument" 1>&2
- fi
- if test $ol_enable_monitor = yes ; then
- echo "configure: warning: slapd disabled, ignoring --enable-monitor argument" 1>&2
- fi
- if test $ol_enable_null = yes ; then
- echo "configure: warning: slapd disabled, ignoring --enable-null argument" 1>&2
- fi
- if test $ol_enable_passwd = yes ; then
- echo "configure: warning: slapd disabled, ignoring --enable-passwd argument" 1>&2
- fi
- if test $ol_enable_perl = yes ; then
- echo "configure: warning: slapd disabled, ignoring --enable-perl argument" 1>&2
- fi
- if test $ol_enable_shell = yes ; then
- echo "configure: warning: slapd disabled, ignoring --enable-shell argument" 1>&2
- fi
- if test $ol_enable_sql = yes ; then
- echo "configure: warning: slapd disabled, ignoring --enable-sql argument" 1>&2
- fi
+ case "$ol_enable_backends" in yes | mod)
+ echo "configure: warning: slapd disabled, ignoring --enable-backends argument" 1>&2
+ esac
+ for i in $Backends; do
+ eval "ol_tmp=\$ol_enable_$i"
+ if test $ol_tmp != no ; then
+ echo "configure: warning: slapd disabled, ignoring --enable-$i argument" 1>&2
+ eval "ol_enable_$i=no"
+ fi
+ done
if test $ol_enable_modules = yes ; then
echo "configure: warning: slapd disabled, ignoring --enable-modules argument" 1>&2
fi
@@ -2650,73 +2686,28 @@ if test $ol_enable_slapd = no ; then
if test $ol_with_ldbm_type != auto ; then
echo "configure: warning: slapd disabled, ignoring --with-ldbm-type argument" 1>&2
fi
- if test $ol_with_bdb_module != static ; then
- echo "configure: warning: slapd disabled, ignoring --with-bdb-module argument" 1>&2
- fi
- if test $ol_with_dnssrv_module != static ; then
- echo "configure: warning: slapd disabled, ignoring --with-dnssrv-module argument" 1>&2
- fi
- if test $ol_with_hdb_module != static ; then
- echo "configure: warning: slapd disabled, ignoring --with-hdb-module argument" 1>&2
- fi
- if test $ol_with_ldap_module != static ; then
- echo "configure: warning: slapd disabled, ignoring --with-ldap-module argument" 1>&2
- fi
- if test $ol_with_ldbm_module != static ; then
- echo "configure: warning: slapd disabled, ignoring --with-ldbm-module argument" 1>&2
- fi
- 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_null_module != static ; then
- echo "configure: warning: slapd disabled, ignoring --with-null-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
- if test $ol_with_perl_module != static ; then
- echo "configure: warning: slapd disabled, ignoring --with-perl-module argument" 1>&2
- fi
- if test $ol_with_shell_module != static ; then
- echo "configure: warning: slapd disabled, ignoring --with-shell-module argument" 1>&2
- fi
- if test $ol_with_sql_module != static ; then
- echo "configure: warning: slapd disabled, ignoring --with-sql-module argument" 1>&2
- fi
if test $ol_enable_slurpd = yes ; then
{ echo "configure: error: slurpd requires slapd" 1>&2; exit 1; }
fi
if test $ol_enable_rewrite = yes ; then
echo "configure: warning: slapd disabled, ignoring --enable-rewrite argument" 1>&2
fi
- if test $ol_with_dyngroup != no ; then
- echo "configure: warning: slapd disabled, ignoring --with-dyngroup argument" 1>&2
- fi
- if test $ol_with_proxycache != no ; then
- echo "configure: warning: slapd disabled, ignoring --with-proxycache argument" 1>&2
- fi
- if test $ol_with_rwm != no ; then
- echo "configure: warning: slapd disabled, ignoring --with-rwm argument" 1>&2
- fi
+ case "$ol_enable_overlays" in yes | mod)
+ echo "configure: warning: slapd disabled, ignoring --enable-overlays argument" 1>&2
+ esac
+ for i in $Overlays; do
+ eval "ol_tmp=\$ol_enable_$i"
+ if test $ol_tmp != no ; then
+ echo "configure: warning: slapd disabled, ignoring --enable-$i argument" 1>&2
+ eval "ol_enable_$i=no"
+ fi
+ done
# force settings to no
ol_enable_slapi=no
- ol_enable_bdb=no
- ol_enable_dnssrv=no
- ol_enable_hdb=no
- ol_enable_ldap=no
- ol_enable_ldbm=no
- ol_enable_meta=no
- ol_enable_monitor=no
- ol_enable_null=no
- ol_enable_passwd=no
- ol_enable_perl=no
- ol_enable_shell=no
- ol_enable_sql=no
+ ol_enable_backends=
+ ol_enable_overlays=
ol_enable_modules=no
ol_enable_multimaster=no
ol_enable_rlookups=no
@@ -2726,27 +2717,10 @@ if test $ol_enable_slapd = no ; then
ol_with_ldbm_api=no
ol_with_ldbm_type=no
- ol_with_bdb_module=static
- ol_with_dnssrv_module=static
- ol_with_hdb_module=static
- ol_with_ldap_module=static
- ol_with_ldbm_module=static
- ol_with_meta_module=static
- ol_with_monitor_module=static
- ol_with_null_module=static
- ol_with_passwd_module=static
- ol_with_perl_module=static
- ol_with_shell_module=static
- ol_with_sql_module=static
-
ol_enable_slurpd=no
ol_enable_rewrite=no
- ol_with_dyngroup=no
- ol_with_proxycache=no
- ol_with_rwm=no
-
elif test $ol_enable_ldbm = no ; then
if test $ol_with_ldbm_api != auto ; then
@@ -2757,10 +2731,6 @@ elif test $ol_enable_ldbm = no ; then
echo "configure: warning: LDBM disabled, ignoring --with-ldbm-type argument" 1>&2
fi
- if test $ol_with_ldbm_module != static ; then
- echo "configure: warning: LDBM disabled, ignoring --with-ldbm-module argument" 1>&2
- fi
-
if test $ol_enable_modules != yes -a \
$ol_enable_bdb = no -a \
$ol_enable_dnssrv = no -a \
@@ -2771,6 +2741,7 @@ elif test $ol_enable_ldbm = no ; then
$ol_enable_null = no -a \
$ol_enable_passwd = no -a \
$ol_enable_perl = no -a \
+ $ol_enable_relay = no -a \
$ol_enable_shell = no -a \
$ol_enable_sql = no ; then
@@ -2784,7 +2755,6 @@ elif test $ol_enable_ldbm = no ; then
ol_with_ldbm_api=no
ol_with_ldbm_type=no
- ol_with_ldbm_module=static
if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then
ol_with_ldbm_api=berkeley
@@ -2804,22 +2774,19 @@ else
{ echo "configure: error: NDBM only supports LDBM type hash" 1>&2; exit 1; }
fi
- if test $ol_enable_bdb = yes -o $ol_enable_hdb = yes ; then
+ if test $ol_enable_bdb != no -o $ol_enable_hdb != no ; then
if test $ol_with_ldbm_api = auto ; then
ol_with_ldbm_api=berkeley
elif test $ol_with_ldbm_api != berkeley ; then
{ echo "configure: error: LDBM API not compatible with BDB/HDB" 1>&2; exit 1; }
fi
-
- elif test $ol_enable_bdb = auto ; then
- if test $ol_with_ldbm_api != berkeley \
- -o $ol_with_ldbm_api != auto ; then
- echo "configure: warning: LDBM API not compatible with BDB, disabling BDB" 1>&2
- ol_enable_bdb=no
- fi
fi
fi
+if test $ol_enable_meta = yes -a $ol_enable_ldap = no ; then
+ { echo "configure: error: --enable-meta requires --enable-ldap" 1>&2; exit 1; }
+fi
+
if test $ol_enable_slurpd = yes ; then
if test $ol_with_threads = no ; then
{ echo "configure: error: slurpd requires threads" 1>&2; exit 1; }
@@ -2832,14 +2799,14 @@ if test $ol_enable_lmpasswd = yes ; then
fi
fi
-if test $ol_enable_kbind = yes -o $ol_enable_kpasswd = yes ; then
+if test $ol_enable_kbind = yes ; then
if test $ol_with_kerberos = no ; then
{ echo "configure: error: options require --with-kerberos" 1>&2; exit 1; }
elif test $ol_with_kerberos = auto ; then
ol_with_kerberos=yes
fi
-elif test $ol_enable_kbind = no -o $ol_enable_kpasswd = no ; then
+elif test $ol_enable_kbind = no ; then
if test $ol_with_kerberos = auto ; then
ol_with_kerberos=no
elif test $ol_with_kerberos != no ; then
@@ -2883,32 +2850,32 @@ BUILD_MONITOR=no
BUILD_NULL=no
BUILD_PASSWD=no
BUILD_PERL=no
+BUILD_RELAY=no
BUILD_SHELL=no
BUILD_SQL=no
-BUILD_BDB_DYNAMIC=static
-BUILD_DNSSRV_DYNAMIC=static
-BUILD_HDB_DYNAMIC=static
-BUILD_LDAP_DYNAMIC=static
-BUILD_LDBM_DYNAMIC=static
-BUILD_META_DYNAMIC=static
-BUILD_MONITOR_DYNAMIC=static
-BUILD_NULL_DYNAMIC=static
-BUILD_PASSWD_DYNAMIC=static
-BUILD_PERL_DYNAMIC=static
-BUILD_SHELL_DYNAMIC=static
-BUILD_SQL_DYNAMIC=static
-
+BUILD_ACCESSLOG=no
+BUILD_DENYOP=no
BUILD_DYNGROUP=no
+BUILD_DYNLIST=no
+BUILD_GLUE=no
+BUILD_LASTMOD=no
+BUILD_PPOLICY=no
BUILD_PROXYCACHE=no
+BUILD_REFINT=no
+BUILD_RETCODE=no
BUILD_RWM=no
+BUILD_SYNCPROV=no
+BUILD_TRANSLUCENT=no
+BUILD_UNIQUE=no
+SLAPD_STATIC_OVERLAYS=
SLAPD_DYNAMIC_OVERLAYS=
SLAPD_MODULES_LDFLAGS=
SLAPD_MODULES_CPPFLAGS=
-SLAPD_STATIC_BACKENDS=
+SLAPD_STATIC_BACKENDS=back-ldif
SLAPD_DYNAMIC_BACKENDS=
SLAPD_PERL_LDFLAGS=
@@ -2930,75 +2897,7 @@ LIBSLAPITOOLS=
AUTH_LIBS=
SLAPD_SLP_LIBS=
-
-
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# 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:2948: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"\${ac_cv_path_install+set}\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
- for ac_dir in $PATH; do
- # Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- if test -f $ac_dir/$ac_prog; then
- if test $ac_prog = install &&
- 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
- fi
- fi
- done
- ;;
- esac
- done
- IFS="$ac_save_IFS"
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL="$ac_cv_path_install"
- else
- # As a last resort, use the slow shell script. We don't cache a
- # path for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the path is relative.
- INSTALL="$ac_install_sh"
- fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# 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_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+SLAPD_GMP_LIBS=
cat >> confdefs.h <<\EOF
@@ -3025,7 +2924,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3029: checking for $ac_word" >&5
+echo "configure:2928: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3077,7 +2976,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3081: checking for $ac_word" >&5
+echo "configure:2980: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3119,7 +3018,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3123: checking for $ac_word" >&5
+echo "configure:3022: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_AR+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3169,12 +3068,12 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
fi
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:3173: checking for Cygwin environment" >&5
+echo "configure:3072: checking for Cygwin environment" >&5
if eval "test \"\${ac_cv_cygwin+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -3201,19 +3100,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:3205: checking for mingw32 environment" >&5
+echo "configure:3104: checking for mingw32 environment" >&5
if eval "test \"\${ac_cv_mingw32+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mingw32=yes
else
@@ -3229,19 +3128,19 @@ echo "$ac_t""$ac_cv_mingw32" 1>&6
MINGW32=
test "$ac_cv_mingw32" = yes && MINGW32=yes
echo $ac_n "checking for EMX OS/2 environment""... $ac_c" 1>&6
-echo "configure:3233: checking for EMX OS/2 environment" >&5
+echo "configure:3132: checking for EMX OS/2 environment" >&5
if eval "test \"\${ac_cv_emxos2+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_emxos2=yes
else
@@ -3257,7 +3156,7 @@ echo "$ac_t""$ac_cv_emxos2" 1>&6
EMXOS2=
test "$ac_cv_emxos2" = yes && EMXOS2=yes
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:3261: checking how to run the C preprocessor" >&5
+echo "configure:3160: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -3272,13 +3171,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:3282: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3181: \"$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
:
@@ -3289,13 +3188,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:3299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3198: \"$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
:
@@ -3306,13 +3205,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:3316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3215: \"$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
:
@@ -3362,7 +3261,7 @@ fi
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3366: checking for $ac_word" >&5
+echo "configure:3265: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3392,7 +3291,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3396: checking for $ac_word" >&5
+echo "configure:3295: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3443,7 +3342,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3447: checking for $ac_word" >&5
+echo "configure:3346: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3475,7 +3374,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:3479: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5
+echo "configure:3378: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -3486,12 +3385,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 3490 "configure"
+#line 3389 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:3495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3394: \"$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
@@ -3517,12 +3416,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:3521: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:3420: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:3526: checking whether we are using GNU C" >&5
+echo "configure:3425: checking whether we are using GNU C" >&5
if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3531,7 +3430,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:3535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:3434: \"$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
@@ -3550,7 +3449,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:3554: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:3453: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3593,7 +3492,7 @@ ac_prog=ld
if test "$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:3597: checking for ld used by GCC" >&5
+echo "configure:3496: checking for ld used by GCC" >&5
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -3623,10 +3522,10 @@ echo "configure:3597: 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:3627: checking for GNU ld" >&5
+echo "configure:3526: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:3630: checking for non-GNU ld" >&5
+echo "configure:3529: checking for non-GNU ld" >&5
fi
if eval "test \"\${lt_cv_path_LD+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3661,7 +3560,7 @@ else
fi
test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:3665: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:3564: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"\${lt_cv_prog_gnu_ld+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3678,7 +3577,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:3682: checking for $LD option to reload object files" >&5
+echo "configure:3581: checking for $LD option to reload object files" >&5
if eval "test \"\${lt_cv_ld_reload_flag+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3690,7 +3589,7 @@ reload_flag=$lt_cv_ld_reload_flag
test -n "$reload_flag" && reload_flag=" $reload_flag"
echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:3694: checking for BSD-compatible nm" >&5
+echo "configure:3593: checking for BSD-compatible nm" >&5
if eval "test \"\${lt_cv_path_NM+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3728,7 +3627,7 @@ NM="$lt_cv_path_NM"
echo "$ac_t""$NM" 1>&6
echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
-echo "configure:3732: checking for a sed that does not truncate output" >&5
+echo "configure:3631: checking for a sed that does not truncate output" >&5
if eval "test \"\${lt_cv_path_SED+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3812,7 +3711,7 @@ fi
echo "$ac_t""$SED" 1>&6
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:3816: checking whether ln -s works" >&5
+echo "configure:3715: checking whether ln -s works" >&5
if eval "test \"\${ac_cv_prog_LN_S+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3833,7 +3732,7 @@ else
fi
echo $ac_n "checking how to recognise dependent libraries""... $ac_c" 1>&6
-echo "configure:3837: checking how to recognise dependent libraries" >&5
+echo "configure:3736: checking how to recognise dependent libraries" >&5
if eval "test \"\${lt_cv_deplibs_check_method+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4019,13 +3918,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:4023: checking for object suffix" >&5
+echo "configure:3922: checking for object suffix" >&5
if eval "test \"\${ac_cv_objext+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
rm -f conftest*
echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:4029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
for ac_file in conftest.*; do
case $ac_file in
*.c) ;;
@@ -4046,7 +3945,7 @@ ac_objext=$ac_cv_objext
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:4050: checking for executable suffix" >&5
+echo "configure:3949: checking for executable suffix" >&5
if eval "test \"\${ac_cv_exeext+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4056,7 +3955,7 @@ else
rm -f conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
- if { (eval echo configure:4060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ if { (eval echo configure:3959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
*.c | *.C | *.o | *.obj | *.xcoff) ;;
@@ -4087,7 +3986,7 @@ fi
# Check for command to grab the raw symbol name followed by C symbol from nm.
echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-echo "configure:4091: checking command to parse $NM output" >&5
+echo "configure:3990: checking command to parse $NM output" >&5
if eval "test \"\${lt_cv_sys_global_symbol_pipe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4170,10 +4069,10 @@ void nm_test_func(){}
int main(){nm_test_var='a';nm_test_func();return(0);}
EOF
- if { (eval echo configure:4174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:4073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { (eval echo configure:4177: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
+ if { (eval echo configure:4076: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -4224,7 +4123,7 @@ EOF
save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$no_builtin_flag"
- if { (eval echo configure:4228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+ if { (eval echo configure:4127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
pipe_works=yes
fi
LIBS="$save_LIBS"
@@ -4273,17 +4172,17 @@ for ac_hdr in dlfcn.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4277: checking for $ac_hdr" >&5
+echo "configure:4176: checking for $ac_hdr" >&5
if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4186: \"$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*
@@ -4319,7 +4218,7 @@ case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:4323: checking for ${ac_tool_prefix}file" >&5
+echo "configure:4222: checking for ${ac_tool_prefix}file" >&5
if eval "test \"\${lt_cv_path_MAGIC_CMD+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4381,7 +4280,7 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:4385: checking for file" >&5
+echo "configure:4284: checking for file" >&5
if eval "test \"\${lt_cv_path_MAGIC_CMD+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4452,7 +4351,7 @@ esac
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4456: checking for $ac_word" >&5
+echo "configure:4355: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_RANLIB+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4484,7 +4383,7 @@ if test -n "$ac_tool_prefix"; then
# 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:4488: checking for $ac_word" >&5
+echo "configure:4387: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_RANLIB+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4519,7 +4418,7 @@ fi
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4523: checking for $ac_word" >&5
+echo "configure:4422: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_STRIP+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4551,7 +4450,7 @@ if test -n "$ac_tool_prefix"; then
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4555: checking for $ac_word" >&5
+echo "configure:4454: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_STRIP+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4600,8 +4499,8 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4604 "configure"' > conftest.$ac_ext
- if { (eval echo configure:4605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ echo '#line 4503 "configure"' > conftest.$ac_ext
+ if { (eval echo configure:4504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -32"
@@ -4622,7 +4521,7 @@ case $host in
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:4626: checking whether the C compiler needs -belf" >&5
+echo "configure:4525: checking whether the C compiler needs -belf" >&5
if eval "test \"\${lt_cv_cc_needs_belf+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4635,14 +4534,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4545: \"$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
@@ -4672,7 +4571,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4676: checking for $ac_word" >&5
+echo "configure:4575: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_DLLTOOL+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4704,7 +4603,7 @@ if test -n "$ac_tool_prefix"; then
# Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4708: checking for $ac_word" >&5
+echo "configure:4607: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_DLLTOOL+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4739,7 +4638,7 @@ fi
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4743: checking for $ac_word" >&5
+echo "configure:4642: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_AS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4771,7 +4670,7 @@ if test -n "$ac_tool_prefix"; then
# Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4775: checking for $ac_word" >&5
+echo "configure:4674: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_AS+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4806,7 +4705,7 @@ fi
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4810: checking for $ac_word" >&5
+echo "configure:4709: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_OBJDUMP+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4838,7 +4737,7 @@ if test -n "$ac_tool_prefix"; then
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4842: checking for $ac_word" >&5
+echo "configure:4741: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_OBJDUMP+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4874,12 +4773,12 @@ fi
# recent cygwin and mingw systems supply a stub DllMain which the user
# can override, but on older systems we have to supply one
echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:4878: checking if libtool should supply DllMain function" >&5
+echo "configure:4777: checking if libtool should supply DllMain function" >&5
if eval "test \"\${lt_cv_need_dllmain+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:4790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
lt_cv_need_dllmain=no
else
@@ -4908,19 +4807,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -mdll"
echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:4912: checking how to link DLLs" >&5
+echo "configure:4811: checking how to link DLLs" >&5
if eval "test \"\${lt_cv_cc_dll_switch+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:4823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
lt_cv_cc_dll_switch=-mdll
else
@@ -5034,7 +4933,7 @@ set dummy $CC
compiler="$2"
echo $ac_n "checking for objdir""... $ac_c" 1>&6
-echo "configure:5038: checking for objdir" >&5
+echo "configure:4937: checking for objdir" >&5
rm -f .libs 2>/dev/null
mkdir .libs 2>/dev/null
if test -d .libs; then
@@ -5061,7 +4960,7 @@ test -z "$pic_mode" && pic_mode=default
# in isolation, and that seeing it set (from the cache) indicates that
# the associated values are set (in the cache) correctly too.
echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-echo "configure:5065: checking for $compiler option to produce PIC" >&5
+echo "configure:4964: checking for $compiler option to produce PIC" >&5
if eval "test \"\${lt_cv_prog_cc_pic+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5209,21 +5108,21 @@ else
# Check to make sure the pic_flag actually works.
echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
-echo "configure:5213: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+echo "configure:5112: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
if eval "test \"\${lt_cv_prog_cc_pic_works+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
case $host_os in
hpux9* | hpux10* | hpux11*)
@@ -5275,7 +5174,7 @@ if test -n "$lt_cv_prog_cc_shlib"; then
fi
echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
-echo "configure:5279: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+echo "configure:5178: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
if eval "test \"\${lt_cv_prog_cc_static_works+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5283,14 +5182,14 @@ else
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
lt_cv_prog_cc_static_works=yes
else
@@ -5317,7 +5216,7 @@ can_build_shared="$lt_cv_prog_cc_can_build_shared"
# Check to see if options -o and -c are simultaneously supported by compiler
echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-echo "configure:5321: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo "configure:5220: checking if $compiler supports -c -o file.$ac_objext" >&5
if eval "test \"\${lt_cv_compiler_c_o+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5336,7 +5235,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:5340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s out/conftest.err; then
@@ -5365,7 +5264,7 @@ echo "$ac_t""$compiler_c_o" 1>&6
if test x"$compiler_c_o" = x"yes"; then
# Check to see if we can write to a .lo
echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
-echo "configure:5369: checking if $compiler supports -c -o file.lo" >&5
+echo "configure:5268: checking if $compiler supports -c -o file.lo" >&5
if eval "test \"\${lt_cv_compiler_o_lo+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5376,14 +5275,14 @@ else
save_objext="$ac_objext"
ac_objext=lo
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -5414,7 +5313,7 @@ hard_links="nottested"
if test "$compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-echo "configure:5418: checking if we can lock with hard links" >&5
+echo "configure:5317: checking if we can lock with hard links" >&5
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -5433,20 +5332,20 @@ fi
if test "$GCC" = yes; then
# Check to see if options -fno-rtti -fno-exceptions are supported by compiler
echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
-echo "configure:5437: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo "configure:5336: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
echo "int some_variable = 0;" > conftest.$ac_ext
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
compiler_rtti_exceptions=no
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -5473,7 +5372,7 @@ fi
# See if the linker supports building shared libraries.
echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
-echo "configure:5477: checking whether the linker ($LD) supports shared libraries" >&5
+echo "configure:5376: checking whether the linker ($LD) supports shared libraries" >&5
allow_undefined_flag=
no_undefined_flag=
@@ -6172,7 +6071,7 @@ test "$ld_shlibs" = no && can_build_shared=no
# Check hardcoding attributes.
echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-echo "configure:6176: checking how to hardcode library paths into programs" >&5
+echo "configure:6075: checking how to hardcode library paths into programs" >&5
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
test -n "$runpath_var"; then
@@ -6200,7 +6099,7 @@ echo "$ac_t""$hardcode_action" 1>&6
striplib=
old_striplib=
echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
-echo "configure:6204: checking whether stripping libraries is possible" >&5
+echo "configure:6103: checking whether stripping libraries is possible" >&5
if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
@@ -6214,7 +6113,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
# PORTME Fill in your ld.so characteristics
echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-echo "configure:6218: checking dynamic linker characteristics" >&5
+echo "configure:6117: checking dynamic linker characteristics" >&5
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6625,11 +6524,11 @@ test "$dynamic_linker" = no && can_build_shared=no
# Report the final consequences.
echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
-echo "configure:6629: checking if libtool supports shared libraries" >&5
+echo "configure:6528: checking if libtool supports shared libraries" >&5
echo "$ac_t""$can_build_shared" 1>&6
echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
-echo "configure:6633: checking whether to build shared libraries" >&5
+echo "configure:6532: checking whether to build shared libraries" >&5
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
@@ -6652,7 +6551,7 @@ esac
echo "$ac_t""$enable_shared" 1>&6
echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
-echo "configure:6656: checking whether to build static libraries" >&5
+echo "configure:6555: checking whether to build static libraries" >&5
# Make sure either enable_shared or enable_static is yes.
test "$enable_shared" = yes || enable_static=yes
echo "$ac_t""$enable_static" 1>&6
@@ -6693,12 +6592,12 @@ else
*)
echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:6697: checking for shl_load" >&5
+echo "configure:6596: checking for shl_load" >&5
if eval "test \"\${ac_cv_func_shl_load+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:6625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shl_load=yes"
else
@@ -6740,7 +6639,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:6744: checking for shl_load in -ldld" >&5
+echo "configure:6643: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6748,7 +6647,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6662: \"$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
@@ -6778,12 +6677,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:6782: checking for dlopen" >&5
+echo "configure:6681: checking for dlopen" >&5
if eval "test \"\${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:6710: \"$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
@@ -6825,7 +6724,7 @@ 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:6829: checking for dlopen in -ldl" >&5
+echo "configure:6728: 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 $ac_n "(cached) $ac_c" 1>&6
@@ -6833,7 +6732,7 @@ 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:6747: \"$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
@@ -6863,7 +6762,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "configure:6867: checking for dlopen in -lsvld" >&5
+echo "configure:6766: checking for dlopen in -lsvld" >&5
ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6871,7 +6770,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsvld $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6785: \"$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
@@ -6901,7 +6800,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "configure:6905: checking for dld_link in -ldld" >&5
+echo "configure:6804: checking for dld_link in -ldld" >&5
ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6909,7 +6808,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6823: \"$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
@@ -6976,7 +6875,7 @@ fi
LIBS="$lt_cv_dlopen_libs $LIBS"
echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "configure:6980: checking whether a program can dlopen itself" >&5
+echo "configure:6879: checking whether a program can dlopen itself" >&5
if eval "test \"\${lt_cv_dlopen_self+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6986,7 +6885,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:6950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -7070,7 +6969,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6
if test "x$lt_cv_dlopen_self" = xyes; then
LDFLAGS="$LDFLAGS $link_static_flag"
echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "configure:7074: checking whether a statically linked program can dlopen itself" >&5
+echo "configure:6973: checking whether a statically linked program can dlopen itself" >&5
if eval "test \"\${lt_cv_dlopen_self_static+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7080,7 +6979,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:7044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -7190,14 +7089,14 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-echo "configure:7194: checking whether -lc should be explicitly linked in" >&5
+echo "configure:7093: checking whether -lc should be explicitly linked in" >&5
if eval "test \"\${lt_cv_archive_cmds_need_lc+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
$rm conftest*
echo 'static int dummy;' > conftest.$ac_ext
- if { (eval echo configure:7201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:7100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
@@ -7210,7 +7109,7 @@ else
libname=conftest
save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
- if { (eval echo configure:7214: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
+ if { (eval echo configure:7113: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
then
lt_cv_archive_cmds_need_lc=no
else
@@ -7795,59 +7694,13 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-# test for ln hardlink support
-echo $ac_n "checking whether ln works""... $ac_c" 1>&6
-echo "configure:7801: checking whether ln works" >&5
-if eval "test \"\${ol_cv_prog_LN_H+set}\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- rm -f conftest.src conftest.dst
-echo "conftest" > conftest.src
-if ln conftest.src conftest.dst 2>/dev/null
-then
- ol_cv_prog_LN_H="ln"
-else
- ol_cv_prog_LN_H="cp"
-fi
-rm -f conftest.src conftest.dst
-
-fi
-LN_H="$ol_cv_prog_LN_H"
-if test "$ol_cv_prog_LN_H" = "ln"; then
- echo "$ac_t""yes" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:7824: checking whether ln -s works" >&5
-if eval "test \"\${ac_cv_prog_LN_S+set}\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
- rm -f conftestdata
- ac_cv_prog_LN_S="ln -s"
-else
- ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
- echo "$ac_t""yes" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-
-ol_link_perl=no
-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:7850: checking for $ac_word" >&5
-if eval "test \"\${ac_cv_path_PERLBIN+set}\" = set"; then
+ol_link_perl=no
+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:7703: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_path_PERLBIN+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$PERLBIN" in
@@ -7889,7 +7742,7 @@ fi
PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`"
PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e 's/ -lc / /' -e 's/ -lc$//'`"
- if test x"$ol_with_perl_module" = "xstatic" ; then
+ if test x"$ol_enable_perl" = "xyes" ; then
SLAPD_PERL_LDFLAGS="$PERL_LDFLAGS"
else
MOD_PERL_LDFLAGS="$PERL_LDFLAGS"
@@ -7899,7 +7752,7 @@ fi
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:7903: checking how to run the C preprocessor" >&5
+echo "configure:7756: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -7914,13 +7767,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:7924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7777: \"$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
:
@@ -7931,13 +7784,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:7941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7794: \"$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
:
@@ -7948,13 +7801,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:7958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7811: \"$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
:
@@ -7979,26 +7832,14 @@ fi
echo "$ac_t""$CPP" 1>&6
-if test $cross_compiling = yes -a $ol_enable_x_compile = yes; then
- echo "configure: warning: cross compiling.... some functionality will be removed." 1>&2
-
-elif test $cross_compiling = no -a $ol_enable_x_compile = yes; then
- echo "configure: warning: programs compiled here do run here..." 1>&2
- { echo "configure: error: if not cross compiling, use --disable-x-compile." 1>&2; exit 1; }
-
-elif test $cross_compiling = yes -a $ol_enable_x_compile = no; then
- echo "configure: warning: programs compiled here do not run here..." 1>&2
- { echo "configure: error: if cross compiling, add --enable-x-compile." 1>&2; exit 1; }
-fi
-
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:7997: checking for Cygwin environment" >&5
+echo "configure:7838: checking for Cygwin environment" >&5
if eval "test \"\${ac_cv_cygwin+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -8025,19 +7866,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:8029: checking for mingw32 environment" >&5
+echo "configure:7870: checking for mingw32 environment" >&5
if eval "test \"\${ac_cv_mingw32+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mingw32=yes
else
@@ -8056,7 +7897,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:8060: checking for executable suffix" >&5
+echo "configure:7901: checking for executable suffix" >&5
if eval "test \"\${ac_cv_exeext+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8066,7 +7907,7 @@ else
rm -f conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
- if { (eval echo configure:8070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ if { (eval echo configure:7911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
*.c | *.C | *.o | *.obj | *.xcoff) ;;
@@ -8087,13 +7928,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:8091: checking for object suffix" >&5
+echo "configure:7932: checking for object suffix" >&5
if eval "test \"\${ac_cv_objext+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
rm -f conftest*
echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:8097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
for ac_file in conftest.*; do
case $ac_file in
*.c) ;;
@@ -8117,7 +7958,7 @@ EOF
echo $ac_n "checking for be_app in -lbe""... $ac_c" 1>&6
-echo "configure:8121: checking for be_app in -lbe" >&5
+echo "configure:7962: checking for be_app in -lbe" >&5
ac_lib_var=`echo be'_'be_app | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8125,7 +7966,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbe -lroot -lnet $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7981: \"$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
@@ -8162,7 +8003,7 @@ fi
echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:8166: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:8007: checking for ${CC-cc} option to accept ANSI C" >&5
if eval "test \"\${am_cv_prog_cc_stdc+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8179,7 +8020,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
@@ -8216,7 +8057,7 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
; return 0; }
EOF
-if { (eval echo configure:8220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
am_cv_prog_cc_stdc="$ac_arg"; break
else
@@ -8250,7 +8091,7 @@ if test -z "${MKDEP}"; then
OL_MKDEP="${CC-cc}"
if test -z "${MKDEP_FLAGS}"; then
echo $ac_n "checking for ${OL_MKDEP} depend flag""... $ac_c" 1>&6
-echo "configure:8254: checking for ${OL_MKDEP} depend flag" >&5
+echo "configure:8095: checking for ${OL_MKDEP} depend flag" >&5
if eval "test \"\${ol_cv_mkdep+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8260,7 +8101,7 @@ else
cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } \
+ if { ac_try='$OL_MKDEP $flag conftest.c'; { (eval echo configure:8105: \"$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
@@ -8293,7 +8134,7 @@ if test "${ol_cv_mkdep}" = no ; then
fi
echo $ac_n "checking for afopen in -ls""... $ac_c" 1>&6
-echo "configure:8297: checking for afopen in -ls" >&5
+echo "configure:8138: checking for afopen in -ls" >&5
ac_lib_var=`echo s'_'afopen | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8301,7 +8142,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ls $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8157: \"$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
@@ -8350,22 +8191,23 @@ EOF
esac
ol_link_modules=no
+WITH_MODULES_ENABLED=no
if test $ol_enable_modules != no ; then
for ac_hdr in ltdl.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8359: checking for $ac_hdr" >&5
+echo "configure:8201: checking for $ac_hdr" >&5
if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8211: \"$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*
@@ -8397,7 +8239,7 @@ done
fi
echo $ac_n "checking for lt_dlinit in -lltdl""... $ac_c" 1>&6
-echo "configure:8401: checking for lt_dlinit in -lltdl" >&5
+echo "configure:8243: checking for lt_dlinit in -lltdl" >&5
ac_lib_var=`echo ltdl'_'lt_dlinit | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8405,7 +8247,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lltdl $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8262: \"$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
@@ -8447,42 +8289,34 @@ fi
{ echo "configure: error: could not locate libtool -lltdl" 1>&2; exit 1; }
fi
ol_link_modules=yes
+ WITH_MODULES_ENABLED=yes
+
else
- ol_with_bdb_module=static
- ol_with_dnssrv_module=static
- ol_with_hdb_module=static
- ol_with_ldap_module=static
- ol_with_ldbm_module=static
- ol_with_meta_module=static
- ol_with_monitor_module=static
- ol_with_null_module=static
- ol_with_passwd_module=static
- ol_with_perl_module=static
- ol_with_shell_module=static
- ol_with_sql_module=static
- if test $ol_with_dyngroup = mod ; then
- echo "configure: warning: building static dyngroup overlay" 1>&2
- ol_with_dyngroup = yes
- fi
- if test $ol_with_proxycache = mod ; then
- echo "configure: warning: building static proxycache overlay" 1>&2
- ol_with_proxycache = yes
- fi
- if test $ol_with_rwm = mod ; then
- echo "configure: warning: building static rwm overlay" 1>&2
- ol_with_rwm = yes
- fi
+ for i in $Backends; do
+ eval "ol_tmp=\$ol_enable_$i"
+ if test $ol_tmp = mod ; then
+ echo "configure: warning: building static $i backend" 1>&2
+ eval "ol_enable_$i=yes"
+ fi
+ done
+ for i in $Overlays; do
+ eval "ol_tmp=\$ol_enable_$i"
+ if test $ol_tmp = mod ; then
+ echo "configure: warning: building static $i overlay" 1>&2
+ eval "ol_enable_$i=yes"
+ fi
+ done
fi
# test for EBCDIC
echo $ac_n "checking for EBCDIC""... $ac_c" 1>&6
-echo "configure:8480: checking for EBCDIC" >&5
+echo "configure:8314: checking for EBCDIC" >&5
if eval "test \"\${ol_cv_cpp_ebcdic+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8329: \"$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*
@@ -8515,12 +8349,12 @@ EOF
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:8519: checking for ANSI C header files" >&5
+echo "configure:8353: checking for ANSI C header files" >&5
if eval "test \"\${ol_cv_header_stdc+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -8528,7 +8362,7 @@ else
#include
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8366: \"$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*
@@ -8545,7 +8379,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
@@ -8563,7 +8397,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
@@ -8584,7 +8418,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <
#ifndef HAVE_EBCDIC
@@ -8602,7 +8436,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:8606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
:
else
@@ -8636,12 +8470,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:8640: checking for $ac_hdr that defines DIR" >&5
+echo "configure:8474: checking for $ac_hdr that defines DIR" >&5
if eval "test \"\${ac_cv_header_dirent_$ac_safe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include <$ac_hdr>
@@ -8649,7 +8483,7 @@ int main() {
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:8653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -8674,7 +8508,7 @@ done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:8678: checking for opendir in -ldir" >&5
+echo "configure:8512: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8682,7 +8516,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8531: \"$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
@@ -8715,7 +8549,7 @@ fi
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:8719: checking for opendir in -lx" >&5
+echo "configure:8553: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8723,7 +8557,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8572: \"$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
@@ -8757,12 +8591,12 @@ fi
fi
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:8761: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:8595: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"\${ac_cv_header_sys_wait_h+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -8778,7 +8612,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:8782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -8799,12 +8633,12 @@ EOF
fi
echo $ac_n "checking POSIX termios""... $ac_c" 1>&6
-echo "configure:8803: checking POSIX termios" >&5
+echo "configure:8637: checking POSIX termios" >&5
if eval "test \"\${am_cv_sys_posix_termios+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -8814,7 +8648,7 @@ int main() {
tcgetattr(0, 0);
; return 0; }
EOF
-if { (eval echo configure:8818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8652: \"$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
@@ -8830,7 +8664,7 @@ echo "$ac_t""$am_cv_sys_posix_termios" 1>&6
echo $ac_n "checking whether use of TIOCGWINSZ requires sys/ioctl.h""... $ac_c" 1>&6
-echo "configure:8834: checking whether use of TIOCGWINSZ requires sys/ioctl.h" >&5
+echo "configure:8668: checking whether use of TIOCGWINSZ requires sys/ioctl.h" >&5
if eval "test \"\${am_cv_sys_tiocgwinsz_needs_sys_ioctl_h+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8839,7 +8673,7 @@ else
gwinsz_in_termios_h=no
if test $am_cv_sys_posix_termios = yes; then
cat > conftest.$ac_ext <
# include
@@ -8859,7 +8693,7 @@ rm -f conftest*
if test $gwinsz_in_termios_h = no; then
cat > conftest.$ac_ext <
# include
@@ -8896,9 +8730,9 @@ fi
for ac_hdr in \
arpa/inet.h \
- arpa/nameser.h \
+ arpa/nameser.h \
assert.h \
- bits/types.h \
+ bits/types.h \
conio.h \
crypt.h \
direct.h \
@@ -8911,7 +8745,7 @@ for ac_hdr in \
libutil.h \
limits.h \
locale.h \
- netinet/tcp.h \
+ netinet/tcp.h \
malloc.h \
memory.h \
psap.h \
@@ -8929,11 +8763,11 @@ for ac_hdr in \
sys/errno.h \
sys/ioctl.h \
sys/param.h \
- sys/resource.h \
- sys/select.h \
- sys/socket.h \
+ sys/resource.h \
+ sys/select.h \
+ sys/socket.h \
sys/stat.h \
- sys/syslog.h \
+ sys/syslog.h \
sys/time.h \
sys/types.h \
sys/ucred.h \
@@ -8941,23 +8775,24 @@ for ac_hdr in \
syslog.h \
termios.h \
unistd.h \
+ utime.h \
winsock.h \
winsock2.h \
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8951: checking for $ac_hdr" >&5
+echo "configure:8786: checking for $ac_hdr" >&5
if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8796: \"$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*
@@ -8985,22 +8820,23 @@ done
-
-echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:8991: checking for dlopen" >&5
-if eval "test \"\${ac_cv_func_dlopen+set}\" = set"; then
+for ac_func in sigaction sigset
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:8827: checking for $ac_func" >&5
+if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char dlopen();
+char $ac_func();
char (*f)();
int main() {
@@ -9008,83 +8844,42 @@ int main() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-f = dlopen;
+f = $ac_func;
#endif
; return 0; }
EOF
-if { (eval echo configure:9020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_func_dlopen=yes"
+ eval "ac_cv_func_$ac_func=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_func_dlopen=no"
+ eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
fi
-if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:9038: 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 $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
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo dl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
cat >> confdefs.h <&6
fi
-
-fi
+done
-echo $ac_n "checking for sigset in -lV3""... $ac_c" 1>&6
-echo "configure:9088: checking for sigset in -lV3" >&5
+if test $ac_cv_func_sigaction = no && test $ac_cv_func_sigaction = no ; then
+ echo $ac_n "checking for sigset in -lV3""... $ac_c" 1>&6
+echo "configure:8883: checking for sigset in -lV3" >&5
ac_lib_var=`echo V3'_'sigset | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9092,7 +8887,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lV3 $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8902: \"$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
@@ -9130,10 +8925,11 @@ else
echo "$ac_t""no" 1>&6
fi
+fi
-if test "$ac_cv_header_winsock_h" = yes; then
+if test "$ac_cv_cygwin" != yes && test "$ac_cv_header_winsock_h" = yes; then
echo $ac_n "checking for winsock""... $ac_c" 1>&6
-echo "configure:9137: checking for winsock" >&5
+echo "configure:8933: checking for winsock" >&5
if eval "test \"\${ol_cv_winsock+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -9141,7 +8937,7 @@ else
for curlib in ws2_32 wsock32; do
LIBS="$LIBS -l$curlib"
cat > conftest.$ac_ext <
@@ -9154,7 +8950,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:9158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_winsock=yes
else
@@ -9192,12 +8988,12 @@ fi
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:9196: checking for socket" >&5
+echo "configure:8992: checking for socket" >&5
if eval "test \"\${ac_cv_func_socket+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9021: \"$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
@@ -9240,7 +9036,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:9244: checking for main in -lsocket" >&5
+echo "configure:9040: checking for main in -lsocket" >&5
ac_lib_var=`echo socket'_'main | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9248,14 +9044,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9055: \"$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
@@ -9283,7 +9079,7 @@ else
fi
echo $ac_n "checking for main in -lnet""... $ac_c" 1>&6
-echo "configure:9287: checking for main in -lnet" >&5
+echo "configure:9083: checking for main in -lnet" >&5
ac_lib_var=`echo net'_'main | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9291,14 +9087,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnet $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9098: \"$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
@@ -9326,7 +9122,7 @@ else
fi
echo $ac_n "checking for main in -lnsl_s""... $ac_c" 1>&6
-echo "configure:9330: checking for main in -lnsl_s" >&5
+echo "configure:9126: checking for main in -lnsl_s" >&5
ac_lib_var=`echo nsl_s'_'main | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9334,14 +9130,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl_s $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9141: \"$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
@@ -9369,7 +9165,7 @@ else
fi
echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
-echo "configure:9373: checking for main in -lnsl" >&5
+echo "configure:9169: checking for main in -lnsl" >&5
ac_lib_var=`echo nsl'_'main | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9377,14 +9173,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9184: \"$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
@@ -9412,7 +9208,7 @@ else
fi
echo $ac_n "checking for socket in -linet""... $ac_c" 1>&6
-echo "configure:9416: checking for socket in -linet" >&5
+echo "configure:9212: checking for socket in -linet" >&5
ac_lib_var=`echo inet'_'socket | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9420,7 +9216,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-linet $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9231: \"$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
@@ -9459,7 +9255,7 @@ else
fi
echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6
-echo "configure:9463: checking for main in -lgen" >&5
+echo "configure:9259: checking for main in -lgen" >&5
ac_lib_var=`echo gen'_'main | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9467,14 +9263,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgen $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9274: \"$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
@@ -9506,12 +9302,12 @@ fi
echo $ac_n "checking for select""... $ac_c" 1>&6
-echo "configure:9510: checking for select" >&5
+echo "configure:9306: checking for select" >&5
if eval "test \"\${ac_cv_func_select+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9335: \"$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
@@ -9558,7 +9354,7 @@ fi
if test "${ac_cv_header_winsock_h}" != yes; then
echo $ac_n "checking types of arguments for select()""... $ac_c" 1>&6
-echo "configure:9562: checking types of arguments for select()" >&5
+echo "configure:9358: checking types of arguments for select()" >&5
if eval "test \"\${ac_cv_func_select_arg234+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -9572,7 +9368,7 @@ else
for ac_cv_func_select_arg1 in 'int' 'size_t' 'unsigned long' 'unsigned'; do
for ac_cv_func_select_arg5 in 'struct timeval *' 'const struct timeval *'; do
cat > conftest.$ac_ext <
@@ -9591,7 +9387,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:9595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_not_found=no ; break 3
else
@@ -9632,21 +9428,77 @@ EOF
fi
-for ac_hdr in regex.h
+for ac_func in poll
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:9435: checking for $ac_func" >&5
+if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+char (*f)();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:9464: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <&6
+fi
+done
+
+for ac_hdr in poll.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9640: checking for $ac_hdr" >&5
+echo "configure:9492: checking for $ac_hdr" >&5
if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9502: \"$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*
@@ -9672,300 +9524,174 @@ else
fi
done
-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 library containing regfree""... $ac_c" 1>&6
-echo "configure:9681: checking for library containing regfree" >&5
-if eval "test \"\${ac_cv_search_regfree+set}\" = set"; then
+for ac_hdr in sys/epoll.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:9533: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_func_search_save_LIBS="$LIBS"
-ac_cv_search_regfree="no"
-cat > conftest.$ac_ext < conftest.$ac_ext <
EOF
-if { (eval echo configure:9699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9543: \"$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*
- ac_cv_search_regfree="none required"
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
-test "$ac_cv_search_regfree" = "no" && for ac_lib in regex gnuregex; do
-LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-cat > conftest.$ac_ext <&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- ac_cv_search_regfree="-l$ac_lib"
-break
+
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
+ echo "$ac_t""no" 1>&6
fi
-rm -f conftest*
done
-LIBS="$ac_func_search_save_LIBS"
-fi
-
-echo "$ac_t""$ac_cv_search_regfree" 1>&6
-if test "$ac_cv_search_regfree" != "no"; then
- test "$ac_cv_search_regfree" = "none required" || LIBS="$ac_cv_search_regfree $LIBS"
- :
-else :
- { echo "configure: error: POSIX regex required." 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking for compatible POSIX regex""... $ac_c" 1>&6
-echo "configure:9744: checking for compatible POSIX regex" >&5
-if eval "test \"\${ol_cv_c_posix_regex+set}\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
- if test "$cross_compiling" = yes; then
- ol_cv_c_posix_regex=cross
+if test "${ac_cv_header_sys_epoll_h}" = yes; then
+echo $ac_n "checking for epoll system call""... $ac_c" 1>&6
+echo "configure:9571: checking for epoll system call" >&5
+if test "$cross_compiling" = yes; then
+ echo "$ac_t""no" 1>&6
else
cat > conftest.$ac_ext <
-#include
-static char *pattern, *string;
-main()
+int main(int argc, char *argv)
{
- int rc;
- regex_t re;
-
- pattern = "^A";
-
- if(regcomp(&re, pattern, 0)) {
- return -1;
- }
-
- string = "ALL MATCH";
-
- rc = regexec(&re, string, 0, (void*)0, 0);
-
- regfree(&re);
-
- return rc;
+ int epfd = epoll_create(256);
+ exit (epfd == -1 ? 1 : 0);
}
EOF
-if { (eval echo configure:9779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
- ol_cv_c_posix_regex=yes
+ echo "$ac_t""yes" 1>&6
+cat >> confdefs.h <<\EOF
+#define HAVE_EPOLL 1
+EOF
+
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -fr conftest*
- ol_cv_c_posix_regex=no
+ echo "$ac_t""no" 1>&6
fi
rm -fr conftest*
fi
fi
-echo "$ac_t""$ol_cv_c_posix_regex" 1>&6
-
-if test "$ol_cv_c_posix_regex" = no ; then
- { echo "configure: error: broken POSIX regex!" 1>&2; exit 1; }
-fi
-
-
-have_uuid=no
-for ac_hdr in sys/uuid.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9805: checking for $ac_hdr" >&5
-if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
+# strerror checks
+echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6
+echo "configure:9604: checking declaration of sys_errlist" >&5
+if eval "test \"\${ol_cv_dcl_sys_errlist+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext < conftest.$ac_ext <
+
+#include
+#include
+#include
+#ifdef WINNT
+#include
+#endif
+int main() {
+char *c = (char *) *sys_errlist
+; return 0; }
EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9815: \"$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
+if { (eval echo configure:9623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
+ ol_cv_dcl_sys_errlist=yes
+ ol_cv_have_sys_errlist=yes
else
- echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ ol_cv_dcl_sys_errlist=no
fi
rm -f conftest*
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <&6
+#
+# It's possible (for near-UNIX clones) that sys_errlist doesn't exist
+if test $ol_cv_dcl_sys_errlist = no ; then
+ cat >> confdefs.h <<\EOF
+#define DECL_SYS_ERRLIST 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-if test $ac_cv_header_sys_uuid_h = yes ; then
- save_LIBS="$LIBS"
-
-echo $ac_n "checking for library containing uuid_to_str""... $ac_c" 1>&6
-echo "configure:9845: checking for library containing uuid_to_str" >&5
-if eval "test \"\${ac_cv_search_uuid_to_str+set}\" = set"; then
+
+ echo $ac_n "checking existence of sys_errlist""... $ac_c" 1>&6
+echo "configure:9646: checking existence of sys_errlist" >&5
+if eval "test \"\${ol_cv_have_sys_errlist+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_func_search_save_LIBS="$LIBS"
-ac_cv_search_uuid_to_str="no"
-cat > conftest.$ac_ext < conftest.$ac_ext <
int main() {
-uuid_to_str()
+char *c = (char *) *sys_errlist
; return 0; }
EOF
-if { (eval echo configure:9863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- ac_cv_search_uuid_to_str="none required"
+ ol_cv_have_sys_errlist=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-test "$ac_cv_search_uuid_to_str" = "no" && for ac_lib in uuid; do
-LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- ac_cv_search_uuid_to_str="-l$ac_lib"
-break
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
+ ol_cv_have_sys_errlist=no
fi
rm -f conftest*
-done
-LIBS="$ac_func_search_save_LIBS"
fi
-echo "$ac_t""$ac_cv_search_uuid_to_str" 1>&6
-if test "$ac_cv_search_uuid_to_str" != "no"; then
- test "$ac_cv_search_uuid_to_str" = "none required" || LIBS="$ac_cv_search_uuid_to_str $LIBS"
- have_uuid=yes
-else :
- :
+echo "$ac_t""$ol_cv_have_sys_errlist" 1>&6
fi
- LIBS="$save_LIBS"
-
- if test have_uuid = yes ; then
- cat >> confdefs.h <<\EOF
-#define HAVE_UUID_TO_STR 1
+if test $ol_cv_have_sys_errlist = yes ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_SYS_ERRLIST 1
EOF
-
- test "$ac_cv_search_uuid_to_str" = "none required" || \
- SLAPD_LIBS="$SLAPD_LIBS $ac_cv_search_uuid_to_str"
- fi
-fi
-
-if test $have_uuid = no ; then
- echo $ac_n "checking to see if -lrpcrt4 is needed for win32 UUID support""... $ac_c" 1>&6
-echo "configure:9920: checking to see if -lrpcrt4 is needed for win32 UUID support" >&5
- save_LIBS="$LIBS"
- LIBS="$LIBS -lrpcrt4"
- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- need_rpcrt=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- need_rpcrt=no
-fi
-rm -f conftest*
- if test $need_rpcrt = yes; then
- SLAPD_LIBS="$SLAPD_LIBS -lrpcrt4"
- fi
- LIBS="$save_LIBS"
- echo "$ac_t""$need_rpcrt" 1>&6
fi
-
-ol_link_dnssrv=no
-echo $ac_n "checking for res_query""... $ac_c" 1>&6
-echo "configure:9956: checking for res_query" >&5
-if eval "test \"\${ac_cv_func_res_query+set}\" = set"; then
+ for ac_func in strerror strerror_r
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:9682: checking for $ac_func" >&5
+if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char res_query();
+char $ac_func();
char (*f)();
int main() {
@@ -9973,354 +9699,403 @@ int main() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_res_query) || defined (__stub___res_query)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-f = res_query;
+f = $ac_func;
#endif
; return 0; }
EOF
-if { (eval echo configure:9985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9711: \"$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"
+ eval "ac_cv_func_$ac_func=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_func_res_query=no"
+ eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
fi
-if eval "test \"`echo '$ac_cv_func_'res_query`\" = yes"; then
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
- :
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <&6
fi
+done
-if test $ac_cv_func_res_query = no ; then
- echo $ac_n "checking for __res_query""... $ac_c" 1>&6
-echo "configure:10006: checking for __res_query" >&5
-if eval "test \"\${ac_cv_func___res_query+set}\" = set"; then
+ol_cv_func_strerror_r=no
+if test "${ac_cv_func_strerror_r}" = yes ; then
+ echo $ac_n "checking non-posix strerror_r""... $ac_c" 1>&6
+echo "configure:9738: checking non-posix strerror_r" >&5
+if eval "test \"\${ol_cv_nonposix_strerror_r+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext < conftest.$ac_ext <
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char __res_query();
-char (*f)();
+#include
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "strerror_r" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ol_decl_strerror_r=yes
+else
+ rm -rf conftest*
+ ol_decl_strerror_r=no
+fi
+rm -f conftest*
+ if test $ol_decl_strerror_r = yes ; then
+ cat > conftest.$ac_ext <
int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub___res_query) || defined (__stub_____res_query)
-choke me
-#else
-f = __res_query;
-#endif
-
+ /* from autoconf 2.59 */
+ char buf[100];
+ char x = *strerror_r (0, buf, sizeof buf);
+ char *p = strerror_r (0, buf, sizeof buf);
+
; return 0; }
EOF
-if { (eval echo configure:10035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_func___res_query=yes"
+ ol_cv_nonposix_strerror_r=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_func___res_query=no"
+ ol_cv_nonposix_strerror_r=no
fi
rm -f conftest*
-fi
+ else
+ if test "$cross_compiling" = yes; then
+ ol_cv_nonposix_strerror=no
+else
+ cat > conftest.$ac_ext <&6
- :
+ main() {
+ char buf[100];
+ buf[0] = 0;
+ strerror_r( 1, buf, sizeof buf );
+ exit( buf[0] == 0 );
+ }
+
+EOF
+if { (eval echo configure:9797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
+then
+ ol_cv_nonposix_strerror_r=yes
else
- echo "$ac_t""no" 1>&6
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ ol_cv_nonposix_strerror=no
+fi
+rm -fr conftest*
+fi
+
+ fi
+
fi
- ac_cv_func_res_query=$ac_cv_func___res_query
+echo "$ac_t""$ol_cv_nonposix_strerror_r" 1>&6
+if test $ol_cv_nonposix_strerror_r = yes ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_NONPOSIX_STRERROR_R 1
+EOF
+
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:10059: 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
+elif test "${ac_cv_func_strerror}" = no ; then
+ echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6
+echo "configure:9823: checking declaration of sys_errlist" >&5
+if eval "test \"\${ol_cv_dcl_sys_errlist+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-lbind $LIBS"
-cat > conftest.$ac_ext < conftest.$ac_ext <
+#include
+#include
+#ifdef WINNT
+#include
+#endif
int main() {
-res_query()
+char *c = (char *) *sys_errlist
; return 0; }
EOF
-if { (eval echo configure:10078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
+ ol_cv_dcl_sys_errlist=yes
+ ol_cv_have_sys_errlist=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ ol_cv_dcl_sys_errlist=no
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo bind | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <&6
fi
- ac_cv_func_res_query=$ac_cv_lib_bind_res_query
-fi
+echo "$ac_t""$ol_cv_dcl_sys_errlist" 1>&6
+#
+# It's possible (for near-UNIX clones) that sys_errlist doesn't exist
+if test $ol_cv_dcl_sys_errlist = no ; then
+ cat >> confdefs.h <<\EOF
+#define DECL_SYS_ERRLIST 1
+EOF
-if test $ac_cv_func_res_query = no ; then
- echo $ac_n "checking for __res_query in -lbind""... $ac_c" 1>&6
-echo "configure:10110: checking for __res_query in -lbind" >&5
-ac_lib_var=`echo bind'_'__res_query | sed 'y%./+-:%__p__%'`
-if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
+
+ echo $ac_n "checking existence of sys_errlist""... $ac_c" 1>&6
+echo "configure:9865: checking existence of sys_errlist" >&5
+if eval "test \"\${ol_cv_have_sys_errlist+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-lbind $LIBS"
-cat > conftest.$ac_ext < conftest.$ac_ext <
int main() {
-__res_query()
+char *c = (char *) *sys_errlist
; return 0; }
EOF
-if { (eval echo configure:10129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9878: \"$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"
+ ol_cv_have_sys_errlist=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ ol_cv_have_sys_errlist=no
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
+fi
+echo "$ac_t""$ol_cv_have_sys_errlist" 1>&6
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo bind | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <> confdefs.h <<\EOF
+#define HAVE_SYS_ERRLIST 1
EOF
- LIBS="-lbind $LIBS"
-
-else
- echo "$ac_t""no" 1>&6
fi
- ac_cv_func_res_query=$ac_cv_lib_bind___res_query
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:10161: 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
+
+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:9906: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-lresolv $LIBS"
-cat > conftest.$ac_ext < conftest.$ac_ext <
EOF
-if { (eval echo configure:10180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
-
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo resolv | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
cat >> confdefs.h <&6
fi
+done
- ac_cv_func_res_query=$ac_cv_lib_resolv_res_query
+if test "$ac_cv_header_regex_h" != yes ; then
+ { echo "configure: error: POSIX regex.h required." 1>&2; exit 1; }
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:10212: checking for __res_query in -lresolv" >&5
-ac_lib_var=`echo resolv'_'__res_query | sed 'y%./+-:%__p__%'`
-if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
+echo $ac_n "checking for library containing regfree""... $ac_c" 1>&6
+echo "configure:9947: checking for library containing regfree" >&5
+if eval "test \"\${ac_cv_search_regfree+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-lresolv $LIBS"
+ ac_func_search_save_LIBS="$LIBS"
+ac_cv_search_regfree="no"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9965: \"$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"
+ ac_cv_search_regfree="none required"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+test "$ac_cv_search_regfree" = "no" && for ac_lib in regex gnuregex; do
+LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ ac_cv_search_regfree="-l$ac_lib"
+break
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
+done
+LIBS="$ac_func_search_save_LIBS"
+fi
+echo "$ac_t""$ac_cv_search_regfree" 1>&6
+if test "$ac_cv_search_regfree" != "no"; then
+ test "$ac_cv_search_regfree" = "none required" || LIBS="$ac_cv_search_regfree $LIBS"
+ :
+else :
+ { echo "configure: error: POSIX regex required." 1>&2; exit 1; }
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo resolv | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <&6
+echo "configure:10010: checking for compatible POSIX regex" >&5
+if eval "test \"\${ol_cv_c_posix_regex+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
- echo "$ac_t""no" 1>&6
-fi
+
+ if test "$cross_compiling" = yes; then
+ ol_cv_c_posix_regex=cross
+else
+ cat > conftest.$ac_ext <
+#include
+static char *pattern, *string;
+main()
+{
+ int rc;
+ regex_t re;
-if test "$ac_cv_func_res_query" = yes ; then
- cat >> confdefs.h <<\EOF
-#define HAVE_RES_QUERY 1
-EOF
+ pattern = "^A";
+ if(regcomp(&re, pattern, 0)) {
+ return -1;
+ }
+
+ string = "ALL MATCH";
+
+ rc = regexec(&re, string, 0, (void*)0, 0);
- if test $ol_enable_dnssrv != no ; then
- ol_link_dnssrv=yes
- fi
+ regfree(&re);
+
+ return rc;
+}
+EOF
+if { (eval echo configure:10045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
+then
+ ol_cv_c_posix_regex=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ ol_cv_c_posix_regex=no
+fi
+rm -fr conftest*
fi
-if test "$ol_enable_dnssrv" = yes -a "$ol_link_dnssrv" = no ; then
- { echo "configure: error: DNSSRV requires res_query()" 1>&2; exit 1; }
fi
-for ac_func in getaddrinfo getnameinfo gai_strerror inet_ntop
+echo "$ac_t""$ol_cv_c_posix_regex" 1>&6
+
+if test "$ol_cv_c_posix_regex" = no ; then
+ { echo "configure: error: broken POSIX regex!" 1>&2; exit 1; }
+fi
+
+
+have_uuid=no
+for ac_hdr in sys/uuid.h
do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10279: checking for $ac_func" >&5
-if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:10071: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func();
-char (*f)();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-; return 0; }
+#include <$ac_hdr>
EOF
-if { (eval echo configure:10308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
cat >> confdefs.h <&2; exit 1; }
- fi
-elif test $ol_enable_ipv6 != no ; then
- echo $ac_n "checking INET6_ADDRSTRLEN""... $ac_c" 1>&6
-echo "configure:10340: checking INET6_ADDRSTRLEN" >&5
-if eval "test \"\${ol_cv_inet6_addrstrlen+set}\" = set"; then
+if test $ac_cv_header_sys_uuid_h = yes ; then
+ save_LIBS="$LIBS"
+
+echo $ac_n "checking for library containing uuid_to_str""... $ac_c" 1>&6
+echo "configure:10111: checking for library containing uuid_to_str" >&5
+if eval "test \"\${ac_cv_search_uuid_to_str+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-
- cat > conftest.$ac_ext < conftest.$ac_ext <
-# ifdef INET6_ADDRSTRLEN
- __has_inet6_addrstrlen__;
-# endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "__has_inet6_addrstrlen__" >/dev/null 2>&1; then
+int main() {
+uuid_to_str()
+; return 0; }
+EOF
+if { (eval echo configure:10129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- ol_cv_inet6_addrstrlen=yes
+ ac_cv_search_uuid_to_str="none required"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+test "$ac_cv_search_uuid_to_str" = "no" && for ac_lib in uuid; do
+LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- ol_cv_inet6_addrstrlen=no
+ ac_cv_search_uuid_to_str="-l$ac_lib"
+break
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
fi
rm -f conftest*
+done
+LIBS="$ac_func_search_save_LIBS"
+fi
+echo "$ac_t""$ac_cv_search_uuid_to_str" 1>&6
+if test "$ac_cv_search_uuid_to_str" != "no"; then
+ test "$ac_cv_search_uuid_to_str" = "none required" || LIBS="$ac_cv_search_uuid_to_str $LIBS"
+ have_uuid=yes
+else :
+ :
fi
+ LIBS="$save_LIBS"
-echo "$ac_t""$ol_cv_inet6_addrstrlen" 1>&6
+ if test have_uuid = yes ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_UUID_TO_STR 1
+EOF
- echo $ac_n "checking struct sockaddr_storage""... $ac_c" 1>&6
-echo "configure:10371: checking struct sockaddr_storage" >&5
-if eval "test \"\${ol_cv_struct_sockaddr_storage+set}\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
- cat > conftest.$ac_ext <
-#include
+if test $have_uuid = no ; then
+ echo $ac_n "checking to see if -lrpcrt4 is needed for win32 UUID support""... $ac_c" 1>&6
+echo "configure:10186: checking to see if -lrpcrt4 is needed for win32 UUID support" >&5
+ save_LIBS="$LIBS"
+ LIBS="$LIBS -lrpcrt4"
+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- ol_cv_struct_sockaddr_storage=yes
+ need_rpcrt=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- ol_cv_struct_sockaddr_storage=no
+ need_rpcrt=no
fi
rm -f conftest*
-fi
-
-echo "$ac_t""$ol_cv_struct_sockaddr_storage" 1>&6
-
- if test $ol_cv_inet6_addrstrlen = yes \
- -a $ol_cv_struct_sockaddr_storage = yes ; then
- ol_link_ipv6=yes
- elif test $ol_enable_ipv6 = yes \
- -a $ol_cv_inet6_addrstrlen = no ; then
- { echo "configure: error: IPv6 support requires INET6_ADDRSTRLEN" 1>&2; exit 1; }
- elif test $ol_enable_ipv6 = yes \
- -a $ol_cv_struct_sockaddr_storage = no ; then
- { echo "configure: error: IPv6 support requires struct sockaddr_storage" 1>&2; exit 1; }
+ if test $need_rpcrt = yes; then
+ SLAPD_LIBS="$SLAPD_LIBS -lrpcrt4"
fi
+ LIBS="$save_LIBS"
+ echo "$ac_t""$need_rpcrt" 1>&6
fi
-if test $ol_enable_local != no ; then
- for ac_hdr in sys/un.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10420: checking for $ac_hdr" >&5
-if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
+ol_cv_lib_resolver=no
+if test $ol_cv_lib_resolver = no ; then
+ echo $ac_n "checking for resolver link (default)""... $ac_c" 1>&6
+echo "configure:10223: checking for resolver link (default)" >&5
+if eval "test \"\${ol_cv_resolver_none+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext < conftest.$ac_ext <
+
+#ifdef HAVE_SYS_TYPES_H
+# include
+#endif
+#include
+#ifdef HAVE_ARPA_NAMESER_H
+# include
+#endif
+#ifdef HAVE_RESOLV_H
+# include
+#endif
+
+int main() {
+{
+ int len, status;
+ char *request = NULL;
+ unsigned char reply[64*1024];
+ unsigned char host[64*1024];
+ unsigned char *p;
+
+#ifdef NS_HFIXEDSZ
+ /* Bind 8/9 interface */
+ len = res_query(request, ns_c_in, ns_t_srv, reply, sizeof(reply));
+#else
+ /* Bind 4 interface */
+# ifndef T_SRV
+# define T_SRV 33
+# endif
+ len = res_query(request, C_IN, T_SRV, reply, sizeof(reply));
+#endif
+ p = reply;
+#ifdef NS_HFIXEDSZ
+ /* Bind 8/9 interface */
+ p += NS_HFIXEDSZ;
+#elif defined(HFIXEDSZ)
+ /* Bind 4 interface w/ HFIXEDSZ */
+ p += HFIXEDSZ;
+#else
+ /* Bind 4 interface w/o HFIXEDSZ */
+ p += sizeof(HEADER);
+#endif
+ status = dn_expand( reply, reply+len, p, host, sizeof(host));
+}
+; return 0; }
EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10430: \"$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
+if { (eval echo configure:10280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
+ ol_cv_resolver_none=yes
else
- echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ ol_cv_resolver_none=no
fi
rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <&6
-fi
-done
+ LIBS="$ol_LIBS"
- if test $ol_enable_local = auto ; then
- ol_enable_local=$ac_cv_header_sys_un_h
- elif test $ac_cv_header_sys_un_h = no ; then
- { echo "configure: error: AF_LOCAL domain support requires sys/un.h" 1>&2; exit 1; }
- fi
fi
-ol_link_kbind=no
-ol_link_kpasswd=no
-ol_link_krb5=no
-ol_link_krb4=no
+echo "$ac_t""$ol_cv_resolver_none" 1>&6
-if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \
- -o $ol_with_kerberos = k5 -o $ol_with_kerberos = k5only \
- -o $ol_with_kerberos = k425 ; then
+ if test $ol_cv_resolver_none = yes ; then
+ ol_cv_lib_resolver=yes
+ fi
+fi
- for ac_hdr in krb5.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10477: checking for $ac_hdr" >&5
-if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
+if test $ol_cv_lib_resolver = no ; then
+ echo $ac_n "checking for resolver link (-lresolv)""... $ac_c" 1>&6
+echo "configure:10304: checking for resolver link (-lresolv)" >&5
+if eval "test \"\${ol_cv_resolver_resolv+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext < conftest.$ac_ext <
+
+#ifdef HAVE_SYS_TYPES_H
+# include
+#endif
+#include
+#ifdef HAVE_ARPA_NAMESER_H
+# include
+#endif
+#ifdef HAVE_RESOLV_H
+# include
+#endif
+
+int main() {
+{
+ int len, status;
+ char *request = NULL;
+ unsigned char reply[64*1024];
+ unsigned char host[64*1024];
+ unsigned char *p;
+
+#ifdef NS_HFIXEDSZ
+ /* Bind 8/9 interface */
+ len = res_query(request, ns_c_in, ns_t_srv, reply, sizeof(reply));
+#else
+ /* Bind 4 interface */
+# ifndef T_SRV
+# define T_SRV 33
+# endif
+ len = res_query(request, C_IN, T_SRV, reply, sizeof(reply));
+#endif
+ p = reply;
+#ifdef NS_HFIXEDSZ
+ /* Bind 8/9 interface */
+ p += NS_HFIXEDSZ;
+#elif defined(HFIXEDSZ)
+ /* Bind 4 interface w/ HFIXEDSZ */
+ p += HFIXEDSZ;
+#else
+ /* Bind 4 interface w/o HFIXEDSZ */
+ p += sizeof(HEADER);
+#endif
+ status = dn_expand( reply, reply+len, p, host, sizeof(host));
+}
+; return 0; }
EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10487: \"$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
+if { (eval echo configure:10361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
+ ol_cv_resolver_resolv=yes
else
- echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ ol_cv_resolver_resolv=no
fi
rm -f conftest*
+
+ LIBS="$ol_LIBS"
+
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <&6
-fi
-done
+echo "$ac_t""$ol_cv_resolver_resolv" 1>&6
- if test $ac_cv_header_krb5_h = yes ; then
- for ac_hdr in heim_err.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10519: checking for $ac_hdr" >&5
-if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
+ if test $ol_cv_resolver_resolv = yes ; then
+ ol_cv_lib_resolver=-lresolv
+ fi
+fi
+
+if test $ol_cv_lib_resolver = no ; then
+ echo $ac_n "checking for resolver link (-lbind)""... $ac_c" 1>&6
+echo "configure:10385: checking for resolver link (-lbind)" >&5
+if eval "test \"\${ol_cv_resolver_bind+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext < conftest.$ac_ext <
+
+#ifdef HAVE_SYS_TYPES_H
+# include
+#endif
+#include
+#ifdef HAVE_ARPA_NAMESER_H
+# include
+#endif
+#ifdef HAVE_RESOLV_H
+# include
+#endif
+
+int main() {
+{
+ int len, status;
+ char *request = NULL;
+ unsigned char reply[64*1024];
+ unsigned char host[64*1024];
+ unsigned char *p;
+
+#ifdef NS_HFIXEDSZ
+ /* Bind 8/9 interface */
+ len = res_query(request, ns_c_in, ns_t_srv, reply, sizeof(reply));
+#else
+ /* Bind 4 interface */
+# ifndef T_SRV
+# define T_SRV 33
+# endif
+ len = res_query(request, C_IN, T_SRV, reply, sizeof(reply));
+#endif
+ p = reply;
+#ifdef NS_HFIXEDSZ
+ /* Bind 8/9 interface */
+ p += NS_HFIXEDSZ;
+#elif defined(HFIXEDSZ)
+ /* Bind 4 interface w/ HFIXEDSZ */
+ p += HFIXEDSZ;
+#else
+ /* Bind 4 interface w/o HFIXEDSZ */
+ p += sizeof(HEADER);
+#endif
+ status = dn_expand( reply, reply+len, p, host, sizeof(host));
+}
+; return 0; }
EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10529: \"$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
+if { (eval echo configure:10442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
+ ol_cv_resolver_bind=yes
else
- echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ ol_cv_resolver_bind=no
fi
rm -f conftest*
+
+ LIBS="$ol_LIBS"
+
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <&6
+
+echo "$ac_t""$ol_cv_resolver_bind" 1>&6
+
+ if test $ol_cv_resolver_bind = yes ; then
+ ol_cv_lib_resolver=-lbind
+ fi
fi
-done
- if test $ac_cv_header_heim_err_h = yes ; then
- krb5_impl=heimdal
- else
- krb5_impl=mit
- fi
- if test $krb5_impl = mit; then
- echo $ac_n "checking for main in -lk5crypto""... $ac_c" 1>&6
-echo "configure:10563: checking for main in -lk5crypto" >&5
-ac_lib_var=`echo k5crypto'_'main | sed 'y%./+-:%__p__%'`
-if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
+
+ol_link_dnssrv=no
+if test "$ol_cv_lib_resolver" != no ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_RES_QUERY 1
+EOF
+
+
+ if test "$ol_enable_dnssrv" != no ; then
+ ol_link_dnssrv=yes
+ fi
+
+ if test "$ol_cv_lib_resolver" != yes ; then
+ LIBS="$ol_cv_lib_resolver $LIBS"
+ fi
+fi
+
+if test "$ol_enable_dnssrv" = yes -o "$ol_enable_dnssrv" = mod ; then
+ if test "$ol_link_dnssrv" = no ; then
+ { echo "configure: error: DNSSRV requires res_query()" 1>&2; exit 1; }
+ fi
+else
+ ol_enable_dnssrv=no
+fi
+
+for ac_func in hstrerror
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:10493: checking for $ac_func" >&5
+if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-lk5crypto $LIBS"
-cat > conftest.$ac_ext < conftest.$ac_ext <
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+char (*f)();
int main() {
-main()
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
; return 0; }
EOF
-if { (eval echo configure:10578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10522: \"$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"
+ eval "ac_cv_func_$ac_func=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
-
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
- krb5crypto=k5crypto
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <&6
-krb5crypto=crypto
fi
+done
- echo $ac_n "checking for main in -lkrb5""... $ac_c" 1>&6
-echo "configure:10601: 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
+for ac_func in getaddrinfo getnameinfo gai_strerror inet_ntop
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:10550: checking for $ac_func" >&5
+if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-lkrb5 -l$krb5crypto -lcom_err $LIBS"
-cat > conftest.$ac_ext < conftest.$ac_ext <
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+char (*f)();
int main() {
-main()
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
; return 0; }
EOF
-if { (eval echo configure:10616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10579: \"$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"
+ eval "ac_cv_func_$ac_func=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
-
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
- have_krb5=yes
- KRB5_LIBS="-lkrb5 -l$krb5crypto -lcom_err"
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <&6
-have_krb5=no
fi
+done
- elif test $krb5_impl = heimdal; then
- echo $ac_n "checking for main in -ldes""... $ac_c" 1>&6
-echo "configure:10641: checking for main in -ldes" >&5
-ac_lib_var=`echo des'_'main | sed 'y%./+-:%__p__%'`
-if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
+ol_link_ipv6=no
+if test $ac_cv_func_getaddrinfo = no -o $ac_cv_func_inet_ntop = no ; then
+ if test $ol_enable_ipv6 = yes ; then
+ { echo "configure: error: IPv6 support requires getaddrinfo() and inet_ntop()" 1>&2; exit 1; }
+ fi
+elif test $ol_enable_ipv6 != no ; then
+ echo $ac_n "checking INET6_ADDRSTRLEN""... $ac_c" 1>&6
+echo "configure:10611: checking INET6_ADDRSTRLEN" >&5
+if eval "test \"\${ol_cv_inet6_addrstrlen+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-ldes $LIBS"
-cat > conftest.$ac_ext < conftest.$ac_ext <
+# ifdef INET6_ADDRSTRLEN
+ __has_inet6_addrstrlen__;
+# endif
+
EOF
-if { (eval echo configure:10656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "__has_inet6_addrstrlen__" >/dev/null 2>&1; then
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
+ ol_cv_inet6_addrstrlen=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ ol_cv_inet6_addrstrlen=no
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- krb5crypto=des
-else
- echo "$ac_t""no" 1>&6
-krb5crypto=crypto
-fi
+
+echo "$ac_t""$ol_cv_inet6_addrstrlen" 1>&6
- echo $ac_n "checking for main in -lkrb5""... $ac_c" 1>&6
-echo "configure:10679: checking for main in -lkrb5" >&5
-ac_lib_var=`echo krb5'_'main | sed 'y%./+-:%__p__%'`
-if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
+ echo $ac_n "checking struct sockaddr_storage""... $ac_c" 1>&6
+echo "configure:10642: checking struct sockaddr_storage" >&5
+if eval "test \"\${ol_cv_struct_sockaddr_storage+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-lkrb5 -l$krb5crypto -lasn1 -lroken -lcom_err $LIBS"
-cat > conftest.$ac_ext < conftest.$ac_ext <
+#include
+
int main() {
-main()
+
+ struct sockaddr_storage ss;
+
; return 0; }
EOF
-if { (eval echo configure:10694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
+ ol_cv_struct_sockaddr_storage=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ ol_cv_struct_sockaddr_storage=no
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
-
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- have_krb5=yes
- KRB5_LIBS="-lkrb5 -l$krb5crypto -lasn1 -lroken -lcom_err"
-else
- echo "$ac_t""no" 1>&6
-have_krb5=no
-fi
-
-
- cat >> confdefs.h <<\EOF
-#define HAVE_HEIMDAL_KERBEROS 1
-EOF
-
-
- else
- have_krb5=no
- echo "configure: warning: Unrecognized Kerberos5 Implementation" 1>&2
- fi
-
- if test $have_krb5 = yes ; then
- ol_link_krb5=yes
-
- cat >> confdefs.h <<\EOF
-#define HAVE_KRB5 1
-EOF
-
-
- if test $ol_enable_kpasswd != no ; then
- ol_link_kpasswd=yes;
- fi
-
- if test $ol_with_kerberos = k5only ; then
- ol_with_kerberos=found
- fi
- elif test $ol_with_kerberos != auto ; then
- { echo "configure: error: Required Kerberos 5 support not available" 1>&2; exit 1; }
- fi
+echo "$ac_t""$ol_cv_struct_sockaddr_storage" 1>&6
+ if test $ol_cv_inet6_addrstrlen = yes \
+ -a $ol_cv_struct_sockaddr_storage = yes ; then
+ ol_link_ipv6=yes
+ elif test $ol_enable_ipv6 = yes \
+ -a $ol_cv_inet6_addrstrlen = no ; then
+ { echo "configure: error: IPv6 support requires INET6_ADDRSTRLEN" 1>&2; exit 1; }
+ elif test $ol_enable_ipv6 = yes \
+ -a $ol_cv_struct_sockaddr_storage = no ; then
+ { echo "configure: error: IPv6 support requires struct sockaddr_storage" 1>&2; exit 1; }
fi
fi
-if test $ol_link_krb5 = yes -a \( $ol_with_kerberos = yes -o \
- $ol_with_kerberos = auto -o $ol_with_kerberos = k425 \) ; then
-
- for ac_hdr in kerberosIV/krb.h kerberosIV/des.h
+if test $ol_enable_local != no ; then
+ for ac_hdr in sys/un.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10757: checking for $ac_hdr" >&5
+echo "configure:10691: checking for $ac_hdr" >&5
if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10701: \"$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*
@@ -10790,65 +10724,127 @@ fi
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:10797: 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
+ if test $ol_enable_local = auto ; then
+ ol_enable_local=$ac_cv_header_sys_un_h
+ elif test $ac_cv_header_sys_un_h = no ; then
+ { echo "configure: error: AF_LOCAL domain support requires sys/un.h" 1>&2; exit 1; }
+ fi
+fi
+
+ol_link_kbind=no
+ol_link_krb5=no
+ol_link_krb4=no
+
+if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \
+ -o $ol_with_kerberos = k5 -o $ol_with_kerberos = k5only \
+ -o $ol_with_kerberos = k425 ; then
+
+ for ac_hdr in krb5.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:10747: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-lkrb4 -ldes425 -lkrb5 -l$krb5crypto -lcom_err $LIBS"
-cat > conftest.$ac_ext < conftest.$ac_ext <
EOF
-if { (eval echo configure:10812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <&6
+fi
+done
+
+ if test $ac_cv_header_krb5_h = yes ; then
+ for ac_hdr in heim_err.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:10789: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- have_k425=yes
- KRB4_LIBS="-lkrb4 -ldes425"
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <&6
-have_k425=no
fi
+done
+ if test $ac_cv_header_heim_err_h = yes ; then
+ krb5_impl=heimdal
+ else
+ krb5_impl=mit
+ fi
- elif test $krb5_impl = heimdal; then
- echo $ac_n "checking for main in -lkrb4""... $ac_c" 1>&6
-echo "configure:10837: checking for main in -lkrb4" >&5
-ac_lib_var=`echo krb4'_'main | sed 'y%./+-:%__p__%'`
+ if test $krb5_impl = mit; then
+ echo $ac_n "checking for main in -lk5crypto""... $ac_c" 1>&6
+echo "configure:10833: checking for main in -lk5crypto" >&5
+ac_lib_var=`echo k5crypto'_'main | sed 'y%./+-:%__p__%'`
if eval "test \"\${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 -l$krb5crypto -lasn1 -lroken -lcom_err $LIBS"
+LIBS="-lk5crypto $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10848: \"$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
@@ -10863,148 +10859,108 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- have_k425=yes
- KRB4_LIBS="-lkrb4"
+ krb5crypto=k5crypto
else
echo "$ac_t""no" 1>&6
-have_k425=no
+krb5crypto=crypto
fi
- else
- have_425=no
- echo "configure: warning: Unrecongized Kerberos V Implementation" 1>&2
- fi
-
- if test $have_k425 = yes ; then
- ol_with_kerberos=found
- ol_link_krb4=yes
-
- cat >> confdefs.h <<\EOF
-#define HAVE_KRB425 1
-EOF
-
- cat >> confdefs.h <<\EOF
-#define HAVE_KRB4 1
-EOF
-
-
- echo $ac_n "checking for des_debug in Kerberos libraries""... $ac_c" 1>&6
-echo "configure:10894: checking for des_debug in Kerberos libraries" >&5
-if eval "test \"\${ol_cv_var_des_debug+set}\" = set"; then
+ echo $ac_n "checking for main in -lkrb5""... $ac_c" 1>&6
+echo "configure:10871: checking for main in -lkrb5" >&5
+ac_lib_var=`echo krb5'_'main | sed 'y%./+-:%__p__%'`
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-
- save_LIBS="$LIBS"
- LIBS="$KRB4_LIBS $KRB5_LIBS $LIBS"
- cat > conftest.$ac_ext < conftest.$ac_ext <
-#include
-extern int des_debug;
-
int main() {
-
-des_debug = 1;
-
+main()
; return 0; }
EOF
-if { (eval echo configure:10915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- ol_cv_var_des_debug=yes
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- ol_cv_var_des_debug=no
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
- LIBS="$save_LIBS"
-
-fi
-
-echo "$ac_t""$ol_cv_var_des_debug" 1>&6
-
- if test $ol_cv_var_des_debug = yes ; then
- cat >> confdefs.h <<\EOF
-#define HAVE_DES_DEBUG 1
-EOF
-
- fi
+LIBS="$ac_save_LIBS"
- LIBS="$save_LIBS"
- fi
- fi
fi
-
-if test $ol_link_krb5 = yes ; then
- ol_with_kerberos=found
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ have_krb5=yes
+ KRB5_LIBS="-lkrb5 -l$krb5crypto -lcom_err"
+else
+ echo "$ac_t""no" 1>&6
+have_krb5=no
fi
-if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \
- -o $ol_with_kerberos = k4 -o $ol_with_kerberos = kth ; then
- for ac_hdr in krb.h des.h krb-archaeology.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10954: checking for $ac_hdr" >&5
-if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
+ elif test $krb5_impl = heimdal; then
+ echo $ac_n "checking for main in -ldes""... $ac_c" 1>&6
+echo "configure:10911: checking for main in -ldes" >&5
+ac_lib_var=`echo des'_'main | sed 'y%./+-:%__p__%'`
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext < conftest.$ac_ext <
+
+int main() {
+main()
+; return 0; }
EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10964: \"$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
+if { (eval echo configure:10926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
+LIBS="$ac_save_LIBS"
+
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <&6
+krb5crypto=crypto
fi
-done
- if test $ac_cv_header_krb_h = yes ; then
- echo $ac_n "checking for main in -lkrb""... $ac_c" 1>&6
-echo "configure:10993: checking for main in -lkrb" >&5
-ac_lib_var=`echo krb'_'main | sed 'y%./+-:%__p__%'`
+ echo $ac_n "checking for main in -lkrb5""... $ac_c" 1>&6
+echo "configure:10949: checking for main in -lkrb5" >&5
+ac_lib_var=`echo krb5'_'main | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lkrb -ldes $LIBS"
+LIBS="-lkrb5 -l$krb5crypto -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:10964: \"$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
@@ -11019,72 +10975,61 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- have_k4=yes
+ have_krb5=yes
+ KRB5_LIBS="-lkrb5 -l$krb5crypto -lasn1 -lroken -lcom_err"
else
echo "$ac_t""no" 1>&6
-have_k4=no
+have_krb5=no
fi
- if test $have_k4 = yes ; then
- ol_with_kerberos=found
- ol_link_krb4=yes
-
cat >> confdefs.h <<\EOF
-#define HAVE_KRB4 1
+#define HAVE_HEIMDAL_KERBEROS 1
EOF
- KRB4_LIBS="-lkrb -ldes"
-
- if test $ac_cv_header_krb_archaeology_h = yes ; then
- cat >> confdefs.h <<\EOF
-#define HAVE_KTH_KERBEROS 1
-EOF
-
- fi
+ else
+ have_krb5=no
+ echo "configure: warning: Unrecognized Kerberos5 Implementation" 1>&2
fi
- fi
-fi
-if test $ol_link_krb4 = yes -a $ol_enable_kpasswd != no ; then
- ol_link_kpasswd=yes
-fi
+ if test $have_krb5 = yes ; then
+ ol_link_krb5=yes
-if test $ol_link_krb4 = yes -a $ol_enable_kbind != no ; then
- ol_link_kbind=yes
+ cat >> confdefs.h <<\EOF
+#define HAVE_KRB5 1
+EOF
-elif test $ol_enable_kbind = yes ; then
- { echo "configure: error: Kerberos IV detection failed" 1>&2; exit 1; }
-fi
-if test $ol_link_krb4 = yes -o $ol_link_krb5 = yes ; then
- cat >> confdefs.h <<\EOF
-#define HAVE_KERBEROS 1
-EOF
+ if test $ol_with_kerberos = k5only ; then
+ ol_with_kerberos=found
+ fi
+ elif test $ol_with_kerberos != auto ; then
+ { echo "configure: error: Required Kerberos 5 support not available" 1>&2; exit 1; }
+ fi
-elif test $ol_with_kerberos != auto -a $ol_with_kerberos != no ; then
- { echo "configure: error: Kerberos detection failed" 1>&2; exit 1; }
+ fi
fi
-ol_link_tls=no
-if test $ol_with_tls != no ; then
- for ac_hdr in openssl/ssl.h ssl.h
+if test $ol_link_krb5 = yes -a \( $ol_with_kerberos = yes -o \
+ $ol_with_kerberos = auto -o $ol_with_kerberos = k425 \) ; then
+
+ for ac_hdr in kerberosIV/krb.h kerberosIV/des.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11078: checking for $ac_hdr" >&5
+echo "configure:11023: checking for $ac_hdr" >&5
if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11033: \"$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*
@@ -11110,74 +11055,26 @@ else
fi
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:11118: checking for SSLeay_add_ssl_algorithms in -lssl" >&5
-ac_lib_var=`echo ssl'_'SSLeay_add_ssl_algorithms | sed 'y%./+-:%__p__%'`
-if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-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
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- have_ssleay=yes
- need_rsaref=no
-else
- echo "$ac_t""no" 1>&6
-have_ssleay=no
-fi
-
- if test $have_ssleay = no ; then
- echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6
-echo "configure:11162: checking for SSL_library_init in -lssl" >&5
-ac_lib_var=`echo ssl'_'SSL_library_init | sed 'y%./+-:%__p__%'`
+ 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:11063: checking for main in -lkrb4" >&5
+ac_lib_var=`echo krb4'_'main | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lssl -lcrypto $LIBS"
+LIBS="-lkrb4 -ldes425 -lkrb5 -l$krb5crypto -lcom_err $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11078: \"$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
@@ -11192,37 +11089,32 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- have_ssleay=yes
- need_rsaref=no
+ have_k425=yes
+ KRB4_LIBS="-lkrb4 -ldes425"
else
echo "$ac_t""no" 1>&6
-have_ssleay=no
+have_k425=no
fi
- fi
- if test $have_ssleay = no ; then
- echo $ac_n "checking for ssl3_accept in -lssl""... $ac_c" 1>&6
-echo "configure:11207: checking for ssl3_accept in -lssl" >&5
-ac_lib_var=`echo ssl'_'ssl3_accept | sed 'y%./+-:%__p__%'`
+ elif test $krb5_impl = heimdal; then
+ echo $ac_n "checking for main in -lkrb4""... $ac_c" 1>&6
+echo "configure:11103: checking for main in -lkrb4" >&5
+ac_lib_var=`echo krb4'_'main | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lssl -lcrypto -lRSAglue -lrsaref $LIBS"
+LIBS="-lkrb4 -lkrb5 -l$krb5crypto -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:11118: \"$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
@@ -11237,171 +11129,104 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- have_ssleay=yes
- need_rsaref=yes
+ have_k425=yes
+ KRB4_LIBS="-lkrb4"
else
echo "$ac_t""no" 1>&6
-have_ssleay=no
+have_k425=no
fi
- fi
-
- if test $have_ssleay = yes ; then
- ol_with_tls=found
- ol_link_tls=yes
-
- cat >> confdefs.h <<\EOF
-#define HAVE_SSLEAY 1
-EOF
-
-
- if test $need_rsaref = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_RSAREF 1
-EOF
-
- TLS_LIBS="-lssl -lcrypto -lRSAglue -lrsaref"
- else
- TLS_LIBS="-lssl -lcrypto"
- fi
+ else
+ have_425=no
+ echo "configure: warning: Unrecongized Kerberos V Implementation" 1>&2
fi
- fi
-else
- echo "configure: warning: TLS data protection not supported!" 1>&2
-fi
+ if test $have_k425 = yes ; then
+ ol_with_kerberos=found
+ ol_link_krb4=yes
-WITH_TLS=no
-if test $ol_link_tls = yes ; then
- cat >> confdefs.h <<\EOF
-#define HAVE_TLS 1
+ cat >> confdefs.h <<\EOF
+#define HAVE_KRB425 1
EOF
- WITH_TLS=yes
-
-elif test $ol_with_tls = auto ; then
- echo "configure: warning: Could not locate TLS/SSL package" 1>&2
- echo "configure: warning: TLS data protection not supported!" 1>&2
-
-elif test $ol_with_tls != no ; then
- { echo "configure: error: Could not locate TLS/SSL package" 1>&2; exit 1; }
-fi
-
-if test $ol_enable_lmpasswd != no; then
- if test $ol_link_tls != yes ; then
- { echo "configure: error: LAN Manager passwords require OpenSSL" 1>&2; exit 1; }
- fi
-
- cat >> confdefs.h <<\EOF
-#define SLAPD_LMHASH 1
+ cat >> confdefs.h <<\EOF
+#define HAVE_KRB4 1
EOF
-fi
-
-ol_link_threads=no
-
-if test $ol_with_threads = auto -o $ol_with_threads = yes \
- -o $ol_with_threads = nt ; then
-
- echo $ac_n "checking for _beginthread""... $ac_c" 1>&6
-echo "configure:11310: checking for _beginthread" >&5
-if eval "test \"\${ac_cv_func__beginthread+set}\" = set"; then
+ echo $ac_n "checking for des_debug in Kerberos libraries""... $ac_c" 1>&6
+echo "configure:11160: checking for des_debug in Kerberos libraries" >&5
+if eval "test \"\${ol_cv_var_des_debug+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext < conftest.$ac_ext <
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char _beginthread();
-char (*f)();
+
+#include
+#include
+extern int des_debug;
int main() {
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub__beginthread) || defined (__stub____beginthread)
-choke me
-#else
-f = _beginthread;
-#endif
+des_debug = 1;
; return 0; }
EOF
-if { (eval echo configure:11339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_func__beginthread=yes"
+ ol_cv_var_des_debug=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_func__beginthread=no"
+ ol_cv_var_des_debug=no
fi
rm -f conftest*
+ LIBS="$save_LIBS"
+
fi
-if eval "test \"`echo '$ac_cv_func_'_beginthread`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-fi
-
-
- if test $ac_cv_func__beginthread = yes ; then
- cat >> confdefs.h <<\EOF
-#define HAVE_NT_THREADS 1
-EOF
-
- ol_cv_nt_threads=yes
- fi
-
-
- if test "$ol_cv_nt_threads" = yes ; then
- ol_link_threads=nt
- ol_with_threads=found
- ol_with_yielding_select=yes
+echo "$ac_t""$ol_cv_var_des_debug" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_NT_SERVICE_MANAGER 1
+ if test $ol_cv_var_des_debug = yes ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_DES_DEBUG 1
EOF
- cat >> confdefs.h <<\EOF
-#define HAVE_NT_EVENT_LOG 1
-EOF
+ fi
+ LIBS="$save_LIBS"
+ fi
fi
+fi
- if test $ol_with_threads = nt ; then
- { echo "configure: error: could not locate NT Threads" 1>&2; exit 1; }
- fi
+if test $ol_link_krb5 = yes ; then
+ ol_with_kerberos=found
fi
-if test $ol_with_threads = auto -o $ol_with_threads = yes \
- -o $ol_with_threads = posix ; then
+if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \
+ -o $ol_with_kerberos = k4 -o $ol_with_kerberos = kth ; then
- for ac_hdr in pthread.h
+ for ac_hdr in krb.h des.h krb-archaeology.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11395: checking for $ac_hdr" >&5
+echo "configure:11220: checking for $ac_hdr" >&5
if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -11428,202 +11253,101 @@ fi
done
- if test $ac_cv_header_pthread_h = yes ; then
- echo $ac_n "checking POSIX thread version""... $ac_c" 1>&6
-echo "configure:11434: checking POSIX thread version" >&5
-if eval "test \"\${ol_cv_pthread_version+set}\" = set"; then
+ if test $ac_cv_header_krb_h = yes ; then
+ echo $ac_n "checking for main in -lkrb""... $ac_c" 1>&6
+echo "configure:11259: checking for main in -lkrb" >&5
+ac_lib_var=`echo krb'_'main | sed 'y%./+-:%__p__%'`
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-
- cat > conftest.$ac_ext < conftest.$ac_ext <
-
int main() {
-
- int i = PTHREAD_CREATE_JOINABLE;
-
+main()
; return 0; }
EOF
-if { (eval echo configure:11451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- cat > conftest.$ac_ext <
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "pthread_detach" >/dev/null 2>&1; then
+if { (eval echo configure:11274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- ol_cv_pthread_version=10
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
- ol_cv_pthread_version=8
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
+LIBS="$ac_save_LIBS"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
-
- cat > conftest.$ac_ext <
-# ifdef PTHREAD_CREATE_UNDETACHED
- draft7
-# endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "draft7" >/dev/null 2>&1; then
- rm -rf conftest*
- ol_cv_pthread_version=7
-else
- rm -rf conftest*
-
- cat > conftest.$ac_ext <
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "pthread_attr_init" >/dev/null 2>&1; then
- rm -rf conftest*
- ol_cv_pthread_version=6
-else
- rm -rf conftest*
-
- cat > conftest.$ac_ext <
-#ifdef PTHREAD_MUTEX_INITIALIZER
- draft5
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "draft5" >/dev/null 2>&1; then
- rm -rf conftest*
- ol_cv_pthread_version=5
-else
- rm -rf conftest*
- ol_cv_pthread_version=4
-fi
-rm -f conftest*
-
-fi
-rm -f conftest*
-
fi
-rm -f conftest*
-
-fi
-rm -f conftest*
-
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ have_k4=yes
+else
+ echo "$ac_t""no" 1>&6
+have_k4=no
fi
-echo "$ac_t""$ol_cv_pthread_version" 1>&6
+ if test $have_k4 = yes ; then
+ ol_with_kerberos=found
+ ol_link_krb4=yes
- if test $ol_cv_pthread_version != 0 ; then
- cat >> confdefs.h <> confdefs.h <<\EOF
+#define HAVE_KRB4 1
EOF
- else
- { echo "configure: error: unknown pthread version" 1>&2; exit 1; }
- fi
-
- # consider threads found
- ol_with_threads=found
-
-
- echo $ac_n "checking for LinuxThreads pthread.h""... $ac_c" 1>&6
-echo "configure:11551: checking for LinuxThreads pthread.h" >&5
-if eval "test \"\${ol_cv_header_linux_threads+set}\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "pthread_kill_other_threads_np" >/dev/null 2>&1; then
- rm -rf conftest*
- ol_cv_header_linux_threads=yes
-else
- rm -rf conftest*
- ol_cv_header_linux_threads=no
-fi
-rm -f conftest*
-
-fi
+ KRB4_LIBS="-lkrb -ldes"
-echo "$ac_t""$ol_cv_header_linux_threads" 1>&6
- if test $ol_cv_header_linux_threads = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_LINUX_THREADS 1
+ if test $ac_cv_header_krb_archaeology_h = yes ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_KTH_KERBEROS 1
EOF
+ fi
+ fi
fi
+fi
-
- echo $ac_n "checking for GNU Pth pthread.h""... $ac_c" 1>&6
-echo "configure:11583: checking for GNU Pth pthread.h" >&5
-if eval "test \"\${ol_cv_header_gnu_pth_pthread_h+set}\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <
-#ifdef _POSIX_THREAD_IS_GNU_PTH
- __gnu_pth__;
-#endif
+if test $ol_link_krb4 = yes -a $ol_enable_kbind != no ; then
+ ol_link_kbind=yes
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "__gnu_pth__" >/dev/null 2>&1; then
- rm -rf conftest*
- ol_cv_header_gnu_pth_pthread_h=yes
-else
- rm -rf conftest*
- ol_cv_header_gnu_pth_pthread_h=no
+elif test $ol_enable_kbind = yes ; then
+ { echo "configure: error: Kerberos IV detection failed" 1>&2; exit 1; }
fi
-rm -f conftest*
-
-fi
+if test $ol_link_krb4 = yes -o $ol_link_krb5 = yes ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_KERBEROS 1
+EOF
-echo "$ac_t""$ol_cv_header_gnu_pth_pthread_h" 1>&6
+elif test $ol_with_kerberos != auto -a $ol_with_kerberos != no ; then
+ { echo "configure: error: Kerberos detection failed" 1>&2; exit 1; }
+fi
- if test $ol_cv_header_gnu_pth_pthread_h = no ; then
- for ac_hdr in sched.h
+
+ol_link_tls=no
+if test $ol_with_tls != no ; then
+ for ac_hdr in openssl/ssl.h ssl.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11617: checking for $ac_hdr" >&5
+echo "configure:11341: checking for $ac_hdr" >&5
if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11351: \"$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*
@@ -11649,111 +11373,694 @@ else
fi
done
- fi
-
- echo $ac_n "checking for pthread_create in default libraries""... $ac_c" 1>&6
-echo "configure:11657: checking for pthread_create in default libraries" >&5
-if eval "test \"\${ol_cv_pthread_create+set}\" = set"; then
+ 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:11381: checking for SSLeay_add_ssl_algorithms in -lssl" >&5
+ac_lib_var=`echo ssl'_'SSLeay_add_ssl_algorithms | sed 'y%./+-:%__p__%'`
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-
- if test "$cross_compiling" = yes; then
- cat > conftest.$ac_ext < conftest.$ac_ext <
-#if HAVE_PTHREADS < 7
-#include
-#endif
-#ifndef NULL
-#define NULL (void*)0
-#endif
-
-static void *task(p)
- void *p;
-{
- return (void *) (p == NULL);
-}
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char SSLeay_add_ssl_algorithms();
int main() {
-
- /* pthread test function */
-#ifndef PTHREAD_CREATE_DETACHED
-#define PTHREAD_CREATE_DETACHED 1
-#endif
- pthread_t t;
- int status;
- int detach = PTHREAD_CREATE_DETACHED;
-
-#if HAVE_PTHREADS > 4
- /* Final pthreads */
- pthread_attr_t attr;
-
- status = pthread_attr_init(&attr);
- if( status ) return status;
-
-#if HAVE_PTHREADS < 7
- status = pthread_attr_setdetachstate(&attr, &detach);
- if( status < 0 ) status = errno;
-#else
- status = pthread_attr_setdetachstate(&attr, detach);
-#endif
- if( status ) return status;
- status = pthread_create( &t, &attr, task, NULL );
-#if HAVE_PTHREADS < 7
- if( status < 0 ) status = errno;
-#endif
- if( status ) return status;
-#else
- /* Draft 4 pthreads */
- status = pthread_create( &t, pthread_attr_default, task, NULL );
- if( status ) return errno;
-
- /* give thread a chance to complete */
- /* it should remain joinable and hence detachable */
- sleep( 1 );
-
- status = pthread_detach( &t );
- if( status ) return errno;
-#endif
-
-#ifdef HAVE_LINUX_THREADS
- pthread_kill_other_threads_np();
-#endif
-
- return 0;
-
+SSLeay_add_ssl_algorithms()
; return 0; }
EOF
-if { (eval echo configure:11731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- ol_cv_pthread_create=yes
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- ol_cv_pthread_create=no
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
-else
- cat > conftest.$ac_ext <
-#if HAVE_PTHREADS < 7
-#include
-#endif
-#ifndef NULL
-#define NULL (void*)0
-#endif
+LIBS="$ac_save_LIBS"
-static void *task(p)
- void *p;
-{
- return (void *) (p == NULL);
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ have_ssleay=yes
+ need_rsaref=no
+else
+ echo "$ac_t""no" 1>&6
+have_ssleay=no
+fi
+
+
+ if test $have_ssleay = no ; then
+ echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6
+echo "configure:11425: checking for SSL_library_init in -lssl" >&5
+ac_lib_var=`echo ssl'_'SSL_library_init | sed 'y%./+-:%__p__%'`
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+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
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ have_ssleay=yes
+ need_rsaref=no
+else
+ echo "$ac_t""no" 1>&6
+have_ssleay=no
+fi
+
+ fi
+
+ if test $have_ssleay = no ; then
+ echo $ac_n "checking for ssl3_accept in -lssl""... $ac_c" 1>&6
+echo "configure:11470: checking for ssl3_accept in -lssl" >&5
+ac_lib_var=`echo ssl'_'ssl3_accept | sed 'y%./+-:%__p__%'`
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+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
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ have_ssleay=yes
+ need_rsaref=yes
+else
+ echo "$ac_t""no" 1>&6
+have_ssleay=no
+fi
+
+ fi
+
+ if test $have_ssleay = yes ; then
+ ol_with_tls=found
+ ol_link_tls=yes
+
+ cat >> confdefs.h <<\EOF
+#define HAVE_SSLEAY 1
+EOF
+
+
+ if test $need_rsaref = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_RSAREF 1
+EOF
+
+
+ TLS_LIBS="-lssl -lcrypto -lRSAglue -lrsaref"
+ else
+ TLS_LIBS="-lssl -lcrypto"
+ fi
+ fi
+ echo $ac_n "checking OpenSSL library version (CRL checking capability)""... $ac_c" 1>&6
+echo "configure:11534: checking OpenSSL library version (CRL checking capability)" >&5
+if eval "test \"\${ol_cv_ssl_crl_compat+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ cat > conftest.$ac_ext <
+#else
+#include
+#endif
+
+/* Require 0.9.7d+ */
+#if OPENSSL_VERSION_NUMBER >= 0x0090704fL
+ char *__ssl_compat = "0.9.7d";
+#endif
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "__ssl_compat" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ol_cv_ssl_crl_compat=yes
+else
+ rm -rf conftest*
+ ol_cv_ssl_crl_compat=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ol_cv_ssl_crl_compat" 1>&6
+
+ if test $ol_cv_ssl_crl_compat = no ; then
+ ol_link_ssl=no
+ else
+ cat >> confdefs.h <<\EOF
+#define HAVE_OPENSSL_CRL 1
+EOF
+
+ fi
+ fi
+
+else
+ echo "configure: warning: TLS data protection not supported!" 1>&2
+fi
+
+WITH_TLS=no
+if test $ol_link_tls = yes ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_TLS 1
+EOF
+
+ WITH_TLS=yes
+
+elif test $ol_with_tls = auto ; then
+ echo "configure: warning: Could not locate TLS/SSL package" 1>&2
+ echo "configure: warning: TLS data protection not supported!" 1>&2
+
+elif test $ol_with_tls != no ; then
+ { echo "configure: error: Could not locate TLS/SSL package" 1>&2; exit 1; }
+fi
+
+if test $ol_enable_lmpasswd != no; then
+ if test $ol_link_tls != yes ; then
+ { echo "configure: error: LAN Manager passwords require OpenSSL" 1>&2; exit 1; }
+ fi
+
+ cat >> confdefs.h <<\EOF
+#define SLAPD_LMHASH 1
+EOF
+
+fi
+
+ol_link_threads=no
+
+if test $ol_with_threads = auto -o $ol_with_threads = yes \
+ -o $ol_with_threads = nt ; then
+
+
+ echo $ac_n "checking for _beginthread""... $ac_c" 1>&6
+echo "configure:11617: checking for _beginthread" >&5
+if eval "test \"\${ac_cv_func__beginthread+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char _beginthread();
+char (*f)();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub__beginthread) || defined (__stub____beginthread)
+choke me
+#else
+f = _beginthread;
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:11646: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func__beginthread=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'_beginthread`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
+ if test $ac_cv_func__beginthread = yes ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_NT_THREADS 1
+EOF
+
+ ol_cv_nt_threads=yes
+ fi
+
+
+ if test "$ol_cv_nt_threads" = yes ; then
+ ol_link_threads=nt
+ ol_with_threads=found
+ ol_with_yielding_select=yes
+
+ cat >> confdefs.h <<\EOF
+#define HAVE_NT_SERVICE_MANAGER 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define HAVE_NT_EVENT_LOG 1
+EOF
+
+ fi
+
+ if test $ol_with_threads = nt ; then
+ { echo "configure: error: could not locate NT Threads" 1>&2; exit 1; }
+ fi
+fi
+
+if test $ol_with_threads = auto -o $ol_with_threads = yes \
+ -o $ol_with_threads = posix ; then
+
+ for ac_hdr in pthread.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11702: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <&6
+fi
+done
+
+
+ if test $ac_cv_header_pthread_h = yes ; then
+ echo $ac_n "checking POSIX thread version""... $ac_c" 1>&6
+echo "configure:11741: checking POSIX thread version" >&5
+if eval "test \"\${ol_cv_pthread_version+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ cat > conftest.$ac_ext <
+
+int main() {
+
+ int i = PTHREAD_CREATE_JOINABLE;
+
+; return 0; }
+EOF
+if { (eval echo configure:11758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ cat > conftest.$ac_ext <
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "pthread_detach" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ol_cv_pthread_version=10
+else
+ rm -rf conftest*
+ ol_cv_pthread_version=8
+fi
+rm -f conftest*
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+ cat > conftest.$ac_ext <
+# ifdef PTHREAD_CREATE_UNDETACHED
+ draft7
+# endif
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "draft7" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ol_cv_pthread_version=7
+else
+ rm -rf conftest*
+
+ cat > conftest.$ac_ext <
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "pthread_attr_init" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ol_cv_pthread_version=6
+else
+ rm -rf conftest*
+
+ cat > conftest.$ac_ext <
+#ifdef PTHREAD_MUTEX_INITIALIZER
+ draft5
+#endif
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "draft5" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ol_cv_pthread_version=5
+else
+ rm -rf conftest*
+ ol_cv_pthread_version=4
+fi
+rm -f conftest*
+
+fi
+rm -f conftest*
+
+fi
+rm -f conftest*
+
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ol_cv_pthread_version" 1>&6
+
+
+ if test $ol_cv_pthread_version != 0 ; then
+ cat >> confdefs.h <&2; exit 1; }
+ fi
+
+ # consider threads found
+ ol_with_threads=found
+
+
+ echo $ac_n "checking for LinuxThreads pthread.h""... $ac_c" 1>&6
+echo "configure:11858: checking for LinuxThreads pthread.h" >&5
+if eval "test \"\${ol_cv_header_linux_threads+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "pthread_kill_other_threads_np" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ol_cv_header_linux_threads=yes
+else
+ rm -rf conftest*
+ ol_cv_header_linux_threads=no
+fi
+rm -f conftest*
+
+
+fi
+
+echo "$ac_t""$ol_cv_header_linux_threads" 1>&6
+ if test $ol_cv_header_linux_threads = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_LINUX_THREADS 1
+EOF
+
+ fi
+
+
+ echo $ac_n "checking for GNU Pth pthread.h""... $ac_c" 1>&6
+echo "configure:11890: checking for GNU Pth pthread.h" >&5
+if eval "test \"\${ol_cv_header_gnu_pth_pthread_h+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <
+#ifdef _POSIX_THREAD_IS_GNU_PTH
+ __gnu_pth__;
+#endif
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "__gnu_pth__" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ol_cv_header_gnu_pth_pthread_h=yes
+else
+ rm -rf conftest*
+ ol_cv_header_gnu_pth_pthread_h=no
+fi
+rm -f conftest*
+
+
+fi
+
+echo "$ac_t""$ol_cv_header_gnu_pth_pthread_h" 1>&6
+
+
+ if test $ol_cv_header_gnu_pth_pthread_h = no ; then
+ for ac_hdr in sched.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11924: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <&6
+fi
+done
+
+ fi
+
+
+ echo $ac_n "checking for pthread_create in default libraries""... $ac_c" 1>&6
+echo "configure:11964: checking for pthread_create in default libraries" >&5
+if eval "test \"\${ol_cv_pthread_create+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ if test "$cross_compiling" = yes; then
+ cat > conftest.$ac_ext <
+#if HAVE_PTHREADS < 7
+#include
+#endif
+#ifndef NULL
+#define NULL (void*)0
+#endif
+
+static void *task(p)
+ void *p;
+{
+ return (void *) (p == NULL);
+}
+
+int main() {
+
+ /* pthread test function */
+#ifndef PTHREAD_CREATE_DETACHED
+#define PTHREAD_CREATE_DETACHED 1
+#endif
+ pthread_t t;
+ int status;
+ int detach = PTHREAD_CREATE_DETACHED;
+
+#if HAVE_PTHREADS > 4
+ /* Final pthreads */
+ pthread_attr_t attr;
+
+ status = pthread_attr_init(&attr);
+ if( status ) return status;
+
+#if HAVE_PTHREADS < 7
+ status = pthread_attr_setdetachstate(&attr, &detach);
+ if( status < 0 ) status = errno;
+#else
+ status = pthread_attr_setdetachstate(&attr, detach);
+#endif
+ if( status ) return status;
+ status = pthread_create( &t, &attr, task, NULL );
+#if HAVE_PTHREADS < 7
+ if( status < 0 ) status = errno;
+#endif
+ if( status ) return status;
+#else
+ /* Draft 4 pthreads */
+ status = pthread_create( &t, pthread_attr_default, task, NULL );
+ if( status ) return errno;
+
+ /* give thread a chance to complete */
+ /* it should remain joinable and hence detachable */
+ sleep( 1 );
+
+ status = pthread_detach( &t );
+ if( status ) return errno;
+#endif
+
+#ifdef HAVE_LINUX_THREADS
+ pthread_kill_other_threads_np();
+#endif
+
+ return 0;
+
+; return 0; }
+EOF
+if { (eval echo configure:12038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ol_cv_pthread_create=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ol_cv_pthread_create=no
+fi
+rm -f conftest*
+else
+ cat > conftest.$ac_ext <
+#if HAVE_PTHREADS < 7
+#include
+#endif
+#ifndef NULL
+#define NULL (void*)0
+#endif
+
+static void *task(p)
+ void *p;
+{
+ return (void *) (p == NULL);
}
@@ -11811,7 +12118,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:11815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_create=yes
else
@@ -11836,7 +12143,7 @@ echo "$ac_t""$ol_cv_pthread_create" 1>&6
if test "$ol_link_threads" = no ; then
# try -kthread
echo $ac_n "checking for pthread link with -kthread""... $ac_c" 1>&6
-echo "configure:11840: checking for pthread link with -kthread" >&5
+echo "configure:12147: checking for pthread link with -kthread" >&5
if eval "test \"\${ol_cv_pthread_kthread+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -11847,7 +12154,7 @@ else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <
@@ -11914,7 +12221,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:11918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_pthread_kthread=yes
else
@@ -11926,7 +12233,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <
@@ -11998,7 +12305,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:12002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_kthread=yes
else
@@ -12028,7 +12335,7 @@ fi
if test "$ol_link_threads" = no ; then
# try -pthread
echo $ac_n "checking for pthread link with -pthread""... $ac_c" 1>&6
-echo "configure:12032: checking for pthread link with -pthread" >&5
+echo "configure:12339: checking for pthread link with -pthread" >&5
if eval "test \"\${ol_cv_pthread_pthread+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -12039,7 +12346,7 @@ else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <
@@ -12106,7 +12413,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:12110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_pthread_pthread=yes
else
@@ -12118,7 +12425,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <
@@ -12190,7 +12497,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:12194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_pthread=yes
else
@@ -12220,7 +12527,7 @@ fi
if test "$ol_link_threads" = no ; then
# try -pthreads
echo $ac_n "checking for pthread link with -pthreads""... $ac_c" 1>&6
-echo "configure:12224: checking for pthread link with -pthreads" >&5
+echo "configure:12531: checking for pthread link with -pthreads" >&5
if eval "test \"\${ol_cv_pthread_pthreads+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -12231,7 +12538,7 @@ else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <
@@ -12298,7 +12605,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:12302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_pthread_pthreads=yes
else
@@ -12310,7 +12617,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <
@@ -12382,7 +12689,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:12386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_pthreads=yes
else
@@ -12412,7 +12719,7 @@ fi
if test "$ol_link_threads" = no ; then
# try -mthreads
echo $ac_n "checking for pthread link with -mthreads""... $ac_c" 1>&6
-echo "configure:12416: checking for pthread link with -mthreads" >&5
+echo "configure:12723: checking for pthread link with -mthreads" >&5
if eval "test \"\${ol_cv_pthread_mthreads+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -12423,7 +12730,7 @@ else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <
@@ -12490,7 +12797,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:12494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_pthread_mthreads=yes
else
@@ -12502,7 +12809,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <
@@ -12574,7 +12881,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:12578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_mthreads=yes
else
@@ -12604,7 +12911,7 @@ fi
if test "$ol_link_threads" = no ; then
# try -thread
echo $ac_n "checking for pthread link with -thread""... $ac_c" 1>&6
-echo "configure:12608: checking for pthread link with -thread" >&5
+echo "configure:12915: checking for pthread link with -thread" >&5
if eval "test \"\${ol_cv_pthread_thread+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -12615,7 +12922,7 @@ else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <
@@ -12682,7 +12989,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:12686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_pthread_thread=yes
else
@@ -12694,7 +13001,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <
@@ -12766,7 +13073,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:12770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_thread=yes
else
@@ -12797,7 +13104,7 @@ fi
if test "$ol_link_threads" = no ; then
# try -lpthread -lmach -lexc -lc_r
echo $ac_n "checking for pthread link with -lpthread -lmach -lexc -lc_r""... $ac_c" 1>&6
-echo "configure:12801: checking for pthread link with -lpthread -lmach -lexc -lc_r" >&5
+echo "configure:13108: checking for pthread link with -lpthread -lmach -lexc -lc_r" >&5
if eval "test \"\${ol_cv_pthread_lpthread_lmach_lexc_lc_r+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -12808,7 +13115,7 @@ else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <
@@ -12875,7 +13182,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:12879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13186: \"$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
@@ -12887,7 +13194,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <
@@ -12959,7 +13266,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:12963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_lpthread_lmach_lexc_lc_r=yes
else
@@ -12989,7 +13296,7 @@ fi
if test "$ol_link_threads" = no ; then
# try -lpthread -lmach -lexc
echo $ac_n "checking for pthread link with -lpthread -lmach -lexc""... $ac_c" 1>&6
-echo "configure:12993: checking for pthread link with -lpthread -lmach -lexc" >&5
+echo "configure:13300: checking for pthread link with -lpthread -lmach -lexc" >&5
if eval "test \"\${ol_cv_pthread_lpthread_lmach_lexc+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13000,7 +13307,7 @@ else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <
@@ -13067,7 +13374,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13378: \"$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
@@ -13079,7 +13386,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <
@@ -13151,7 +13458,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:13155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_lpthread_lmach_lexc=yes
else
@@ -13182,7 +13489,7 @@ fi
if test "$ol_link_threads" = no ; then
# try -lpthread -Wl,-woff,85
echo $ac_n "checking for pthread link with -lpthread -Wl,-woff,85""... $ac_c" 1>&6
-echo "configure:13186: checking for pthread link with -lpthread -Wl,-woff,85" >&5
+echo "configure:13493: checking for pthread link with -lpthread -Wl,-woff,85" >&5
if eval "test \"\${ol_cv_pthread_lib_lpthread_woff+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13193,7 +13500,7 @@ else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <
@@ -13260,7 +13567,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13571: \"$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
@@ -13272,7 +13579,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <
@@ -13344,7 +13651,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:13348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_lib_lpthread_woff=yes
else
@@ -13375,7 +13682,7 @@ fi
if test "$ol_link_threads" = no ; then
# try -lpthread
echo $ac_n "checking for pthread link with -lpthread""... $ac_c" 1>&6
-echo "configure:13379: checking for pthread link with -lpthread" >&5
+echo "configure:13686: checking for pthread link with -lpthread" >&5
if eval "test \"\${ol_cv_pthread_lpthread+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13386,7 +13693,7 @@ else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <
@@ -13453,7 +13760,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_pthread_lpthread=yes
else
@@ -13465,7 +13772,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <
@@ -13537,7 +13844,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:13541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_lpthread=yes
else
@@ -13567,7 +13874,7 @@ fi
if test "$ol_link_threads" = no ; then
# try -lc_r
echo $ac_n "checking for pthread link with -lc_r""... $ac_c" 1>&6
-echo "configure:13571: checking for pthread link with -lc_r" >&5
+echo "configure:13878: checking for pthread link with -lc_r" >&5
if eval "test \"\${ol_cv_pthread_lc_r+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13578,7 +13885,7 @@ else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <
@@ -13645,7 +13952,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13956: \"$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
@@ -13657,7 +13964,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <
@@ -13729,7 +14036,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:13733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_lc_r=yes
else
@@ -13760,7 +14067,7 @@ fi
if test "$ol_link_threads" = no ; then
# try -threads
echo $ac_n "checking for pthread link with -threads""... $ac_c" 1>&6
-echo "configure:13764: checking for pthread link with -threads" >&5
+echo "configure:14071: checking for pthread link with -threads" >&5
if eval "test \"\${ol_cv_pthread_threads+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13771,7 +14078,7 @@ else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <
@@ -13838,7 +14145,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_pthread_threads=yes
else
@@ -13850,7 +14157,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <
@@ -13922,7 +14229,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:13926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_threads=yes
else
@@ -13953,7 +14260,7 @@ fi
if test "$ol_link_threads" = no ; then
# try -lpthreads -lmach -lexc -lc_r
echo $ac_n "checking for pthread link with -lpthreads -lmach -lexc -lc_r""... $ac_c" 1>&6
-echo "configure:13957: checking for pthread link with -lpthreads -lmach -lexc -lc_r" >&5
+echo "configure:14264: checking for pthread link with -lpthreads -lmach -lexc -lc_r" >&5
if eval "test \"\${ol_cv_pthread_lpthreads_lmach_lexc_lc_r+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13964,7 +14271,7 @@ else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <
@@ -14031,7 +14338,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:14035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14342: \"$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
@@ -14043,7 +14350,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <
@@ -14115,7 +14422,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:14119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_lpthreads_lmach_lexc_lc_r=yes
else
@@ -14145,7 +14452,7 @@ fi
if test "$ol_link_threads" = no ; then
# try -lpthreads -lmach -lexc
echo $ac_n "checking for pthread link with -lpthreads -lmach -lexc""... $ac_c" 1>&6
-echo "configure:14149: checking for pthread link with -lpthreads -lmach -lexc" >&5
+echo "configure:14456: checking for pthread link with -lpthreads -lmach -lexc" >&5
if eval "test \"\${ol_cv_pthread_lpthreads_lmach_lexc+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14156,7 +14463,7 @@ else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <
@@ -14223,7 +14530,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:14227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14534: \"$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
@@ -14235,7 +14542,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <
@@ -14307,7 +14614,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:14311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_lpthreads_lmach_lexc=yes
else
@@ -14337,7 +14644,7 @@ fi
if test "$ol_link_threads" = no ; then
# try -lpthreads -lexc
echo $ac_n "checking for pthread link with -lpthreads -lexc""... $ac_c" 1>&6
-echo "configure:14341: checking for pthread link with -lpthreads -lexc" >&5
+echo "configure:14648: checking for pthread link with -lpthreads -lexc" >&5
if eval "test \"\${ol_cv_pthread_lpthreads_lexc+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14348,7 +14655,7 @@ else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <
@@ -14415,7 +14722,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:14419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14726: \"$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
@@ -14427,7 +14734,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <
@@ -14499,7 +14806,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:14503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_lpthreads_lexc=yes
else
@@ -14530,7 +14837,7 @@ fi
if test "$ol_link_threads" = no ; then
# try -lpthreads
echo $ac_n "checking for pthread link with -lpthreads""... $ac_c" 1>&6
-echo "configure:14534: checking for pthread link with -lpthreads" >&5
+echo "configure:14841: checking for pthread link with -lpthreads" >&5
if eval "test \"\${ol_cv_pthread_lib_lpthreads+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14541,7 +14848,7 @@ else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <
@@ -14608,7 +14915,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:14612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14919: \"$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
@@ -14620,7 +14927,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <
@@ -14692,7 +14999,7 @@ int main(argc, argv)
}
EOF
-if { (eval echo configure:14696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:15003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
then
ol_cv_pthread_lib_lpthreads=yes
else
@@ -14729,12 +15036,12 @@ fi
for ac_func in sched_yield pthread_yield thr_yield
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14733: checking for $ac_func" >&5
+echo "configure:15040: checking for $ac_func" >&5
if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15069: \"$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
@@ -14787,7 +15094,7 @@ done
$ac_cv_func_pthread_yield = no -a \
$ac_cv_func_thr_yield = no ; then
echo $ac_n "checking for sched_yield in -lrt""... $ac_c" 1>&6
-echo "configure:14791: checking for sched_yield in -lrt" >&5
+echo "configure:15098: checking for sched_yield in -lrt" >&5
ac_lib_var=`echo rt'_'sched_yield | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -14795,7 +15102,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lrt $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15117: \"$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
@@ -14842,12 +15149,12 @@ fi
for ac_func in pthread_kill pthread_rwlock_destroy
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14846: checking for $ac_func" >&5
+echo "configure:15153: checking for $ac_func" >&5
if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15182: \"$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
@@ -14897,13 +15204,13 @@ done
echo $ac_n "checking for pthread_detach with ""... $ac_c" 1>&6
-echo "configure:14901: checking for pthread_detach with " >&5
+echo "configure:15208: checking for pthread_detach with " >&5
if eval "test \"\${ol_cv_func_pthread_detach+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
@@ -14915,7 +15222,7 @@ int main() {
pthread_detach(NULL);
; return 0; }
EOF
-if { (eval echo configure:14919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15226: \"$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
@@ -14947,12 +15254,12 @@ EOF
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14951: checking for $ac_func" >&5
+echo "configure:15258: checking for $ac_func" >&5
if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15287: \"$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
@@ -15005,12 +15312,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:15009: checking for $ac_func" >&5
+echo "configure:15316: checking for $ac_func" >&5
if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15345: \"$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
@@ -15059,7 +15366,7 @@ fi
done
echo $ac_n "checking for LinuxThreads implementation""... $ac_c" 1>&6
-echo "configure:15063: checking for LinuxThreads implementation" >&5
+echo "configure:15370: checking for LinuxThreads implementation" >&5
if eval "test \"\${ol_cv_sys_linux_threads+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -15072,7 +15379,7 @@ echo "$ac_t""$ol_cv_sys_linux_threads" 1>&6
echo $ac_n "checking for LinuxThreads consistency""... $ac_c" 1>&6
-echo "configure:15076: checking for LinuxThreads consistency" >&5
+echo "configure:15383: checking for LinuxThreads consistency" >&5
if eval "test \"\${ol_cv_linux_threads+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -15097,7 +15404,7 @@ echo "$ac_t""$ol_cv_linux_threads" 1>&6
fi
echo $ac_n "checking if pthread_create() works""... $ac_c" 1>&6
-echo "configure:15101: checking if pthread_create() works" >&5
+echo "configure:15408: checking if pthread_create() works" >&5
if eval "test \"\${ol_cv_pthread_create_works+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -15106,7 +15413,7 @@ else
ol_cv_pthread_create_works=yes
else
cat > conftest.$ac_ext <
@@ -15173,174 +15480,494 @@ int main(argc, argv)
pthread_kill_other_threads_np();
#endif
- return 0;
-
-}
-
+ return 0;
+
+}
+
+EOF
+if { (eval echo configure:15489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
+then
+ ol_cv_pthread_create_works=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ ol_cv_pthread_create_works=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$ol_cv_pthread_create_works" 1>&6
+
+ if test $ol_cv_pthread_create_works = no ; then
+ { echo "configure: error: pthread_create is not usable, check environment settings" 1>&2; exit 1; }
+ fi
+
+ if test $ol_with_yielding_select = auto ; then
+ echo $ac_n "checking if select yields when using pthreads""... $ac_c" 1>&6
+echo "configure:15511: checking if select yields when using pthreads" >&5
+if eval "test \"\${ol_cv_pthread_select_yields+set}\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ if test "$cross_compiling" = yes; then
+ ol_cv_pthread_select_yields=cross
+else
+ cat > conftest.$ac_ext <
+#include