X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=configure;h=55ee1dc6845ffed0db0604a13a38434db4b7329e;hb=302af6a0e7ec0cd5357d5a31df00642f76608d6e;hp=eeec1a85080264b8006a874440e86d531d792433;hpb=36b9c2a33962d698e1cf9c76702c6fdd5a962bc9;p=openldap
diff --git a/configure b/configure
index eeec1a8508..55ee1dc684 100755
--- a/configure
+++ b/configure
@@ -1,15 +1,15 @@
#! /bin/sh
-# From configure.in Id: 2ad531a4ba542cdb01a5f2242c38c034b7ad46a1 .
+# From configure.in Id: 46e5e8cc8f0216bd3fa077597f237c3dbabd3a75 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68.
+# Generated by GNU Autoconf 2.65.
#
-# Copyright 1998-2013 The OpenLDAP Foundation. All rights reserved.
+# Copyright 1998-2017 The OpenLDAP Foundation. All rights reserved.
# Restrictions apply, see COPYRIGHT and LICENSE files.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -93,7 +93,6 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -219,18 +218,11 @@ IFS=$as_save_IFS
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
# works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
BASH_ENV=/dev/null
ENV=/dev/null
(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
if test x$as_have_required = xno; then :
@@ -329,7 +321,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -369,19 +361,19 @@ else
fi # as_fn_arith
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -693,7 +685,7 @@ test -n "$DJDIR" || exec 7<&0 &1
# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -757,6 +749,8 @@ ac_includes_default="\
#endif"
ac_subst_vars='LTLIBOBJS
+WT_LIBS
+WT_INCS
SLAPD_SQL_INCLUDES
SLAPD_SQL_LIBS
SLAPD_SQL_LDFLAGS
@@ -809,8 +803,10 @@ BUILD_DENYOP
BUILD_DDS
BUILD_CONSTRAINT
BUILD_COLLECT
+BUILD_AUTOCA
BUILD_AUDITLOG
BUILD_ACCESSLOG
+BUILD_WT
BUILD_SQL
BUILD_SOCK
BUILD_SHELL
@@ -820,6 +816,7 @@ BUILD_PASSWD
BUILD_NULL
BUILD_NDB
BUILD_MONITOR
+BUILD_ASYNCMETA
BUILD_META
BUILD_MDB
BUILD_LDAP
@@ -838,6 +835,7 @@ WITH_SASL
PLAT
LIBSRCS
LIBOBJS
+PKGCONFIG
MYSQL
LTSTATIC
OL_MKDEP_FLAGS
@@ -979,12 +977,13 @@ enable_slp
enable_wrappers
enable_xxslapbackends
enable_backends
-enable_deprecated_bdb
+enable_bdb
enable_dnssrv
-enable_deprecated_hdb
+enable_hdb
enable_ldap
enable_mdb
enable_meta
+enable_asyncmeta
enable_monitor
enable_ndb
enable_null
@@ -994,10 +993,12 @@ enable_relay
enable_shell
enable_sock
enable_sql
+enable_wt
enable_xxslapoverlays
enable_overlays
enable_accesslog
enable_auditlog
+enable_autoca
enable_collect
enable_constraint
enable_dds
@@ -1098,9 +1099,8 @@ do
fi
case $ac_option in
- *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *=) ac_optarg= ;;
- *) ac_optarg=yes ;;
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1145,7 +1145,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1171,7 +1171,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1375,7 +1375,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1391,7 +1391,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1421,8 +1421,8 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+ -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
;;
*=*)
@@ -1430,7 +1430,7 @@ Try \`$0 --help' for more information"
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1440,7 +1440,7 @@ Try \`$0 --help' for more information"
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
esac
@@ -1448,13 +1448,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error $? "missing argument to $ac_option"
+ as_fn_error "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1477,7 +1477,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1491,8 +1491,8 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1507,9 +1507,9 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error $? "working directory cannot be determined"
+ as_fn_error "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error $? "pwd does not report name of working directory"
+ as_fn_error "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1548,11 +1548,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1592,7 +1592,7 @@ Configuration:
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking ...' messages
+ -q, --quiet, --silent do not print \`checking...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1679,12 +1679,13 @@ SLAPD (Standalone LDAP Daemon) Options:
SLAPD Backend Options:
--enable-backends enable all available backends no|yes|mod
- --enable-deprecated-bdb enable deprecated Berkeley DB backend. Will be removed in OpenLDAP 2.6 no|yes|mod [no]
+ --enable-bdb enable Berkeley DB backend no|yes|mod [no]
--enable-dnssrv enable dnssrv backend no|yes|mod [no]
- --enable-deprecated-hdb enable deprecated Hierarchical DB backend. Will be removed in OpenLDAP 2.6 no|yes|mod [no]
+ --enable-hdb enable Hierarchical DB backend no|yes|mod [no]
--enable-ldap enable ldap backend no|yes|mod [no]
--enable-mdb enable mdb database backend no|yes|mod [yes]
--enable-meta enable metadirectory backend no|yes|mod [no]
+ --enable-asyncmeta enable asynchronous metadirectory backend no|yes|mod [no]
--enable-monitor enable monitor backend no|yes|mod [yes]
--enable-ndb enable MySQL NDB Cluster backend no|yes|mod [no]
--enable-null enable null backend no|yes|mod [no]
@@ -1694,11 +1695,13 @@ SLAPD Backend Options:
--enable-shell enable shell backend no|yes|mod [no]
--enable-sock enable sock backend no|yes|mod [no]
--enable-sql enable sql backend no|yes|mod [no]
+ --enable-wt enable WiredTiger backend no|yes|mod [no]
SLAPD Overlay Options:
--enable-overlays enable all available overlays no|yes|mod
--enable-accesslog In-Directory Access Logging overlay no|yes|mod [no]
--enable-auditlog Audit Logging overlay no|yes|mod [no]
+ --enable-autoca Automatic Certificate Authority overlay no|yes|mod [no]
--enable-collect Collect overlay no|yes|mod [no]
--enable-constraint Attribute Constraint overlay no|yes|mod [no]
--enable-dds Dynamic Directory Services overlay no|yes|mod [no]
@@ -1822,13 +1825,13 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.65
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
-Copyright 1998-2013 The OpenLDAP Foundation. All rights reserved.
+Copyright 1998-2017 The OpenLDAP Foundation. All rights reserved.
Restrictions apply, see COPYRIGHT and LICENSE files.
_ACEOF
exit
@@ -1871,7 +1874,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
@@ -1917,7 +1920,7 @@ fi
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_link
@@ -1943,7 +1946,7 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
+ test $ac_status = 0; } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -1954,7 +1957,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
@@ -1967,10 +1970,10 @@ fi
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -2006,7 +2009,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
ac_header_preproc=no
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
@@ -2029,15 +2032,17 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## --------------------------------------------- ##
+( cat <<\_ASBOX
+## --------------------------------------------- ##
## Report this to ##
-## --------------------------------------------- ##"
+## --------------------------------------------- ##
+_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -2046,7 +2051,7 @@ eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_c_check_header_mongrel
@@ -2087,7 +2092,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_run
@@ -2101,7 +2106,7 @@ ac_fn_c_check_header_compile ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2119,7 +2124,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_c_check_header_compile
@@ -2131,7 +2136,7 @@ ac_fn_c_check_func ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2186,7 +2191,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_c_check_func
@@ -2199,7 +2204,7 @@ ac_fn_c_check_type ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
eval "$3=no"
@@ -2240,7 +2245,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_c_check_type
@@ -2253,7 +2258,7 @@ ac_fn_c_check_member ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
$as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2297,7 +2302,7 @@ fi
eval ac_res=\$$4
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_c_check_member
@@ -2474,7 +2479,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
rm -f conftest.val
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_compute_int
@@ -2483,7 +2488,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2593,9 +2598,11 @@ trap 'exit_status=$?
{
echo
- $as_echo "## ---------------- ##
+ cat <<\_ASBOX
+## ---------------- ##
## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -2629,9 +2636,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
)
echo
- $as_echo "## ----------------- ##
+ cat <<\_ASBOX
+## ----------------- ##
## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_vars
do
@@ -2644,9 +2653,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
echo
if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
+ cat <<\_ASBOX
+## ------------------- ##
## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_files
do
@@ -2660,9 +2671,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
fi
if test -s confdefs.h; then
- $as_echo "## ----------- ##
+ cat <<\_ASBOX
+## ----------- ##
## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
echo
cat confdefs.h
echo
@@ -2717,12 +2730,7 @@ _ACEOF
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
+ ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
@@ -2737,11 +2745,7 @@ do
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+ . "$ac_site_file"
fi
done
@@ -2801,7 +2805,7 @@ if $ac_cache_corrupted; then
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -2842,22 +2846,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_aux_dir=
for ac_dir in build "$srcdir"/build; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
+ for ac_t in install-sh install.sh shtool; do
+ if test -f "$ac_dir/$ac_t"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
+ break 2
+ fi
+ done
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in build \"$srcdir\"/build" "$LINENO" 5
+ as_fn_error "cannot find install-sh, install.sh, or shtool in build \"$srcdir\"/build" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2871,13 +2869,13 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
eval `$ac_aux_dir/version.sh`
if test -z "$OL_STRING"; then
- as_fn_error $? "could not determine version" "$LINENO" 5
+ as_fn_error "could not determine version" "$LINENO" 5
fi
if test -f "$ac_aux_dir/shtool" && test ! -d $ac_aux_dir/shtool; then
ac_cv_shtool="$ac_aux_dir/shtool"
else
- as_fn_error $? "no shtool found in $ac_aux_dir" "$LINENO" 5
+ as_fn_error "no shtool found in $ac_aux_dir" "$LINENO" 5
fi
SHTOOL="$ac_cv_shtool"
@@ -2899,27 +2897,27 @@ echo "Configuring ${TB}${OL_STRING}${TN} ${OPENLDAP_REPO}..."
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
+if test "${ac_cv_build+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -2937,14 +2935,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
+if test "${ac_cv_host+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
@@ -2952,7 +2950,7 @@ fi
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -2970,14 +2968,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
$as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
+if test "${ac_cv_target+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "x$target_alias" = x; then
ac_cv_target=$ac_cv_host
else
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
fi
fi
@@ -2985,7 +2983,7 @@ fi
$as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
@@ -3026,7 +3024,7 @@ am__api_version="1.9"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+if test "${ac_cv_path_install+set}" = set; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3126,7 +3124,7 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
alias in your environment" "$LINENO" 5
fi
@@ -3136,7 +3134,7 @@ then
# Ok.
:
else
- as_fn_error $? "newly created file is older than distributed files!
+ as_fn_error "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -3203,7 +3201,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -3243,7 +3241,7 @@ done
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -3251,7 +3249,7 @@ SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3282,7 +3280,7 @@ rmdir .tst 2>/dev/null
# test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then
- as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
# test whether we have cygpath
@@ -3328,7 +3326,7 @@ if test "$cross_compiling" != no; then
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -3368,7 +3366,7 @@ if test -z "$ac_cv_prog_STRIP"; then
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -3517,7 +3515,7 @@ if test "${enable_debug+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-debug" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-debug" "$LINENO" 5
fi
ol_enable_debug="$ol_arg"
@@ -3538,7 +3536,7 @@ if test "${enable_dynamic+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-dynamic" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-dynamic" "$LINENO" 5
fi
ol_enable_dynamic="$ol_arg"
@@ -3559,7 +3557,7 @@ if test "${enable_syslog+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-syslog" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-syslog" "$LINENO" 5
fi
ol_enable_syslog="$ol_arg"
@@ -3580,7 +3578,7 @@ if test "${enable_proctitle+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-proctitle" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-proctitle" "$LINENO" 5
fi
ol_enable_proctitle="$ol_arg"
@@ -3602,7 +3600,7 @@ if test "${enable_ipv6+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-ipv6" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-ipv6" "$LINENO" 5
fi
ol_enable_ipv6="$ol_arg"
@@ -3623,7 +3621,7 @@ if test "${enable_local+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-local" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-local" "$LINENO" 5
fi
ol_enable_local="$ol_arg"
@@ -3645,7 +3643,7 @@ if test "${with_cyrus_sasl+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $withval for --with-cyrus_sasl" "$LINENO" 5
+ as_fn_error "bad value $withval for --with-cyrus_sasl" "$LINENO" 5
fi
ol_with_cyrus_sasl="$ol_arg"
@@ -3666,7 +3664,7 @@ if test "${with_fetch+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $withval for --with-fetch" "$LINENO" 5
+ as_fn_error "bad value $withval for --with-fetch" "$LINENO" 5
fi
ol_with_fetch="$ol_arg"
@@ -3687,7 +3685,7 @@ if test "${with_threads+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $withval for --with-threads" "$LINENO" 5
+ as_fn_error "bad value $withval for --with-threads" "$LINENO" 5
fi
ol_with_threads="$ol_arg"
@@ -3708,7 +3706,7 @@ if test "${with_tls+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $withval for --with-tls" "$LINENO" 5
+ as_fn_error "bad value $withval for --with-tls" "$LINENO" 5
fi
ol_with_tls="$ol_arg"
@@ -3729,7 +3727,7 @@ if test "${with_yielding_select+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $withval for --with-yielding_select" "$LINENO" 5
+ as_fn_error "bad value $withval for --with-yielding_select" "$LINENO" 5
fi
ol_with_yielding_select="$ol_arg"
@@ -3750,7 +3748,7 @@ if test "${with_mp+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $withval for --with-mp" "$LINENO" 5
+ as_fn_error "bad value $withval for --with-mp" "$LINENO" 5
fi
ol_with_mp="$ol_arg"
@@ -3771,7 +3769,7 @@ if test "${with_odbc+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $withval for --with-odbc" "$LINENO" 5
+ as_fn_error "bad value $withval for --with-odbc" "$LINENO" 5
fi
ol_with_odbc="$ol_arg"
@@ -3799,7 +3797,7 @@ if test "${enable_slapd+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-slapd" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-slapd" "$LINENO" 5
fi
ol_enable_slapd="$ol_arg"
@@ -3820,7 +3818,7 @@ if test "${enable_dynacl+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-dynacl" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-dynacl" "$LINENO" 5
fi
ol_enable_dynacl="$ol_arg"
@@ -3841,7 +3839,7 @@ if test "${enable_aci+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-aci" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-aci" "$LINENO" 5
fi
ol_enable_aci="$ol_arg"
@@ -3862,7 +3860,7 @@ if test "${enable_cleartext+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-cleartext" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-cleartext" "$LINENO" 5
fi
ol_enable_cleartext="$ol_arg"
@@ -3883,7 +3881,7 @@ if test "${enable_crypt+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-crypt" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-crypt" "$LINENO" 5
fi
ol_enable_crypt="$ol_arg"
@@ -3904,7 +3902,7 @@ if test "${enable_lmpasswd+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-lmpasswd" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-lmpasswd" "$LINENO" 5
fi
ol_enable_lmpasswd="$ol_arg"
@@ -3925,7 +3923,7 @@ if test "${enable_spasswd+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-spasswd" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-spasswd" "$LINENO" 5
fi
ol_enable_spasswd="$ol_arg"
@@ -3946,7 +3944,7 @@ if test "${enable_modules+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-modules" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-modules" "$LINENO" 5
fi
ol_enable_modules="$ol_arg"
@@ -3967,7 +3965,7 @@ if test "${enable_rewrite+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-rewrite" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-rewrite" "$LINENO" 5
fi
ol_enable_rewrite="$ol_arg"
@@ -3988,7 +3986,7 @@ if test "${enable_rlookups+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-rlookups" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-rlookups" "$LINENO" 5
fi
ol_enable_rlookups="$ol_arg"
@@ -4009,7 +4007,7 @@ if test "${enable_slapi+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-slapi" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-slapi" "$LINENO" 5
fi
ol_enable_slapi="$ol_arg"
@@ -4030,7 +4028,7 @@ if test "${enable_slp+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-slp" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-slp" "$LINENO" 5
fi
ol_enable_slp="$ol_arg"
@@ -4051,7 +4049,7 @@ if test "${enable_wrappers+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-wrappers" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-wrappers" "$LINENO" 5
fi
ol_enable_wrappers="$ol_arg"
@@ -4067,6 +4065,7 @@ Backends="bdb \
ldap \
mdb \
meta \
+ asyncmeta \
monitor \
ndb \
null \
@@ -4075,7 +4074,8 @@ Backends="bdb \
relay \
shell \
sock \
- sql"
+ sql \
+ wt"
# Check whether --enable-xxslapbackends was given.
if test "${enable_xxslapbackends+set}" = set; then :
@@ -4095,18 +4095,18 @@ if test "${enable_backends+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-backends" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-backends" "$LINENO" 5
fi
ol_enable_backends="$ol_arg"
fi
# end --enable-backends
-# OpenLDAP --enable-deprecated_bdb
+# OpenLDAP --enable-bdb
- # Check whether --enable-deprecated_bdb was given.
-if test "${enable_deprecated_bdb+set}" = set; then :
- enableval=$enable_deprecated_bdb;
+ # Check whether --enable-bdb was given.
+if test "${enable_bdb+set}" = set; then :
+ enableval=$enable_bdb;
ol_arg=invalid
for ol_val in no yes mod ; do
if test "$enableval" = "$ol_val" ; then
@@ -4114,15 +4114,15 @@ if test "${enable_deprecated_bdb+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-deprecated_bdb" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-bdb" "$LINENO" 5
fi
- ol_enable_deprecated_bdb="$ol_arg"
+ ol_enable_bdb="$ol_arg"
else
- ol_enable_deprecated_bdb=${ol_enable_backends:-no}
+ ol_enable_bdb=${ol_enable_backends:-no}
fi
-# end --enable-deprecated_bdb
+# end --enable-bdb
# OpenLDAP --enable-dnssrv
# Check whether --enable-dnssrv was given.
@@ -4135,7 +4135,7 @@ if test "${enable_dnssrv+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-dnssrv" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-dnssrv" "$LINENO" 5
fi
ol_enable_dnssrv="$ol_arg"
@@ -4144,11 +4144,11 @@ else
fi
# end --enable-dnssrv
-# OpenLDAP --enable-deprecated_hdb
+# OpenLDAP --enable-hdb
- # Check whether --enable-deprecated_hdb was given.
-if test "${enable_deprecated_hdb+set}" = set; then :
- enableval=$enable_deprecated_hdb;
+ # Check whether --enable-hdb was given.
+if test "${enable_hdb+set}" = set; then :
+ enableval=$enable_hdb;
ol_arg=invalid
for ol_val in no yes mod ; do
if test "$enableval" = "$ol_val" ; then
@@ -4156,15 +4156,15 @@ if test "${enable_deprecated_hdb+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-deprecated_hdb" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-hdb" "$LINENO" 5
fi
- ol_enable_deprecated_hdb="$ol_arg"
+ ol_enable_hdb="$ol_arg"
else
- ol_enable_deprecated_hdb=${ol_enable_backends:-no}
+ ol_enable_hdb=${ol_enable_backends:-no}
fi
-# end --enable-deprecated_hdb
+# end --enable-hdb
# OpenLDAP --enable-ldap
# Check whether --enable-ldap was given.
@@ -4177,7 +4177,7 @@ if test "${enable_ldap+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-ldap" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-ldap" "$LINENO" 5
fi
ol_enable_ldap="$ol_arg"
@@ -4198,7 +4198,7 @@ if test "${enable_mdb+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-mdb" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-mdb" "$LINENO" 5
fi
ol_enable_mdb="$ol_arg"
@@ -4219,7 +4219,7 @@ if test "${enable_meta+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-meta" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-meta" "$LINENO" 5
fi
ol_enable_meta="$ol_arg"
@@ -4228,6 +4228,27 @@ else
fi
# end --enable-meta
+# OpenLDAP --enable-asyncmeta
+
+ # Check whether --enable-asyncmeta was given.
+if test "${enable_asyncmeta+set}" = set; then :
+ enableval=$enable_asyncmeta;
+ 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
+ as_fn_error "bad value $enableval for --enable-asyncmeta" "$LINENO" 5
+ fi
+ ol_enable_asyncmeta="$ol_arg"
+
+else
+ ol_enable_asyncmeta=${ol_enable_backends:-no}
+fi
+
+# end --enable-asyncmeta
# OpenLDAP --enable-monitor
# Check whether --enable-monitor was given.
@@ -4240,7 +4261,7 @@ if test "${enable_monitor+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-monitor" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-monitor" "$LINENO" 5
fi
ol_enable_monitor="$ol_arg"
@@ -4261,7 +4282,7 @@ if test "${enable_ndb+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-ndb" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-ndb" "$LINENO" 5
fi
ol_enable_ndb="$ol_arg"
@@ -4282,7 +4303,7 @@ if test "${enable_null+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-null" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-null" "$LINENO" 5
fi
ol_enable_null="$ol_arg"
@@ -4303,7 +4324,7 @@ if test "${enable_passwd+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-passwd" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-passwd" "$LINENO" 5
fi
ol_enable_passwd="$ol_arg"
@@ -4324,7 +4345,7 @@ if test "${enable_perl+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-perl" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-perl" "$LINENO" 5
fi
ol_enable_perl="$ol_arg"
@@ -4345,7 +4366,7 @@ if test "${enable_relay+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-relay" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-relay" "$LINENO" 5
fi
ol_enable_relay="$ol_arg"
@@ -4366,7 +4387,7 @@ if test "${enable_shell+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-shell" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-shell" "$LINENO" 5
fi
ol_enable_shell="$ol_arg"
@@ -4387,7 +4408,7 @@ if test "${enable_sock+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-sock" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-sock" "$LINENO" 5
fi
ol_enable_sock="$ol_arg"
@@ -4408,7 +4429,7 @@ if test "${enable_sql+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-sql" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-sql" "$LINENO" 5
fi
ol_enable_sql="$ol_arg"
@@ -4417,9 +4438,31 @@ else
fi
# end --enable-sql
+# OpenLDAP --enable-wt
+
+ # Check whether --enable-wt was given.
+if test "${enable_wt+set}" = set; then :
+ enableval=$enable_wt;
+ 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
+ as_fn_error "bad value $enableval for --enable-wt" "$LINENO" 5
+ fi
+ ol_enable_wt="$ol_arg"
+
+else
+ ol_enable_wt=${ol_enable_backends:-no}
+fi
+
+# end --enable-wt
Overlays="accesslog \
auditlog \
+ autoca \
collect \
constraint \
dds \
@@ -4457,7 +4500,7 @@ if test "${enable_overlays+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-overlays" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-overlays" "$LINENO" 5
fi
ol_enable_overlays="$ol_arg"
@@ -4476,7 +4519,7 @@ if test "${enable_accesslog+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-accesslog" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-accesslog" "$LINENO" 5
fi
ol_enable_accesslog="$ol_arg"
@@ -4498,7 +4541,7 @@ if test "${enable_auditlog+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-auditlog" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-auditlog" "$LINENO" 5
fi
ol_enable_auditlog="$ol_arg"
@@ -4508,6 +4551,28 @@ fi
# end --enable-auditlog
+# OpenLDAP --enable-autoca
+
+ # Check whether --enable-autoca was given.
+if test "${enable_autoca+set}" = set; then :
+ enableval=$enable_autoca;
+ 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
+ as_fn_error "bad value $enableval for --enable-autoca" "$LINENO" 5
+ fi
+ ol_enable_autoca="$ol_arg"
+
+else
+ ol_enable_autoca=${ol_enable_overlays:-no}
+fi
+
+# end --enable-autoca
+
# OpenLDAP --enable-collect
# Check whether --enable-collect was given.
@@ -4520,7 +4585,7 @@ if test "${enable_collect+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-collect" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-collect" "$LINENO" 5
fi
ol_enable_collect="$ol_arg"
@@ -4542,7 +4607,7 @@ if test "${enable_constraint+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-constraint" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-constraint" "$LINENO" 5
fi
ol_enable_constraint="$ol_arg"
@@ -4564,7 +4629,7 @@ if test "${enable_dds+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-dds" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-dds" "$LINENO" 5
fi
ol_enable_dds="$ol_arg"
@@ -4586,7 +4651,7 @@ if test "${enable_deref+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-deref" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-deref" "$LINENO" 5
fi
ol_enable_deref="$ol_arg"
@@ -4608,7 +4673,7 @@ if test "${enable_dyngroup+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-dyngroup" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-dyngroup" "$LINENO" 5
fi
ol_enable_dyngroup="$ol_arg"
@@ -4630,7 +4695,7 @@ if test "${enable_dynlist+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-dynlist" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-dynlist" "$LINENO" 5
fi
ol_enable_dynlist="$ol_arg"
@@ -4652,7 +4717,7 @@ if test "${enable_memberof+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-memberof" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-memberof" "$LINENO" 5
fi
ol_enable_memberof="$ol_arg"
@@ -4674,7 +4739,7 @@ if test "${enable_ppolicy+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-ppolicy" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-ppolicy" "$LINENO" 5
fi
ol_enable_ppolicy="$ol_arg"
@@ -4696,7 +4761,7 @@ if test "${enable_proxycache+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-proxycache" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-proxycache" "$LINENO" 5
fi
ol_enable_proxycache="$ol_arg"
@@ -4718,7 +4783,7 @@ if test "${enable_refint+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-refint" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-refint" "$LINENO" 5
fi
ol_enable_refint="$ol_arg"
@@ -4740,7 +4805,7 @@ if test "${enable_retcode+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-retcode" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-retcode" "$LINENO" 5
fi
ol_enable_retcode="$ol_arg"
@@ -4762,7 +4827,7 @@ if test "${enable_rwm+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-rwm" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-rwm" "$LINENO" 5
fi
ol_enable_rwm="$ol_arg"
@@ -4784,7 +4849,7 @@ if test "${enable_seqmod+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-seqmod" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-seqmod" "$LINENO" 5
fi
ol_enable_seqmod="$ol_arg"
@@ -4806,7 +4871,7 @@ if test "${enable_sssvlv+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-sssvlv" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-sssvlv" "$LINENO" 5
fi
ol_enable_sssvlv="$ol_arg"
@@ -4828,7 +4893,7 @@ if test "${enable_syncprov+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-syncprov" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-syncprov" "$LINENO" 5
fi
ol_enable_syncprov="$ol_arg"
@@ -4850,7 +4915,7 @@ if test "${enable_translucent+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-translucent" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-translucent" "$LINENO" 5
fi
ol_enable_translucent="$ol_arg"
@@ -4872,7 +4937,7 @@ if test "${enable_unique+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-unique" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-unique" "$LINENO" 5
fi
ol_enable_unique="$ol_arg"
@@ -4894,7 +4959,7 @@ if test "${enable_valsort+set}" = set; then :
fi
done
if test "$ol_arg" = "invalid" ; then
- as_fn_error $? "bad value $enableval for --enable-valsort" "$LINENO" 5
+ as_fn_error "bad value $enableval for --enable-valsort" "$LINENO" 5
fi
ol_enable_valsort="$ol_arg"
@@ -5029,12 +5094,13 @@ $as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-$i argument" >&2;}
ol_enable_rewrite=no
elif test $ol_enable_modules != yes &&
- test $ol_enable_deprecated_bdb = no &&
+ test $ol_enable_bdb = no &&
test $ol_enable_dnssrv = no &&
- test $ol_enable_deprecated_hdb = no &&
+ test $ol_enable_hdb = no &&
test $ol_enable_ldap = no &&
test $ol_enable_mdb = no &&
test $ol_enable_meta = no &&
+ test $ol_enable_asyncmeta = no &&
test $ol_enable_monitor = no &&
test $ol_enable_ndb = no &&
test $ol_enable_null = no &&
@@ -5043,10 +5109,11 @@ elif test $ol_enable_modules != yes &&
test $ol_enable_relay = no &&
test $ol_enable_shell = no &&
test $ol_enable_sock = no &&
- test $ol_enable_sql = no ; then
+ test $ol_enable_sql = no &&
+ test $ol_enable_wt = no ; then
if test $ol_enable_slapd = yes ; then
- as_fn_error $? "slapd requires a backend" "$LINENO" 5
+ as_fn_error "slapd requires a backend" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: skipping slapd, no backend specified" >&5
$as_echo "$as_me: WARNING: skipping slapd, no backend specified" >&2;}
@@ -5055,18 +5122,22 @@ $as_echo "$as_me: WARNING: skipping slapd, no backend specified" >&2;}
fi
if test $ol_enable_meta/$ol_enable_ldap = yes/no ; then
- as_fn_error $? "--enable-meta requires --enable-ldap" "$LINENO" 5
+ as_fn_error "--enable-meta requires --enable-ldap" "$LINENO" 5
+fi
+
+if test $ol_enable_asyncmeta/$ol_enable_ldap = yes/no ; then
+ as_fn_error "--enable-asyncmeta requires --enable-ldap" "$LINENO" 5
fi
if test $ol_enable_lmpasswd = yes ; then
if test $ol_with_tls = no ; then
- as_fn_error $? "LAN Manager passwords require OpenSSL" "$LINENO" 5
+ as_fn_error "LAN Manager passwords require OpenSSL" "$LINENO" 5
fi
fi
if test $ol_enable_spasswd = yes ; then
if test $ol_with_cyrus_sasl = no ; then
- as_fn_error $? "options require --with-cyrus-sasl" "$LINENO" 5
+ as_fn_error "options require --with-cyrus-sasl" "$LINENO" 5
fi
ol_with_cyrus_sasl=yes
fi
@@ -5096,6 +5167,7 @@ BUILD_HDB=no
BUILD_LDAP=no
BUILD_MDB=no
BUILD_META=no
+BUILD_ASYNCMETA=no
BUILD_MONITOR=no
BUILD_NDB=no
BUILD_NULL=no
@@ -5105,9 +5177,11 @@ BUILD_RELAY=no
BUILD_SHELL=no
BUILD_SOCK=no
BUILD_SQL=no
+BUILD_WT=no
BUILD_ACCESSLOG=no
BUILD_AUDITLOG=no
+BUILD_AUTOCA=no
BUILD_CONSTRAINT=no
BUILD_DDS=no
BUILD_DENYOP=no
@@ -5183,7 +5257,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -5222,7 +5296,7 @@ done
if test "$CC" = cc ; then
if test $ol_with_threads != auto ; then
- as_fn_error $? "--with-threads requires cc_r (or other suitable compiler) on AIX" "$LINENO" 5
+ as_fn_error "--with-threads requires cc_r (or other suitable compiler) on AIX" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: disabling threads, no cc_r on AIX" >&5
$as_echo "$as_me: WARNING: disabling threads, no cc_r on AIX" >&2;}
@@ -5245,7 +5319,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -5284,7 +5358,7 @@ test -n "$CC" || CC="missing"
if test "${CC}" = "missing" ; then
- as_fn_error $? "Unable to locate cc(1) or suitable replacement. Check PATH or set CC." "$LINENO" 5
+ as_fn_error "Unable to locate cc(1) or suitable replacement. Check PATH or set CC." "$LINENO" 5
fi
fi
@@ -5295,7 +5369,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+if test "${ac_cv_prog_AR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
@@ -5334,7 +5408,7 @@ test -n "$AR" || AR="missing"
if test "${AR}" = "missing" ; then
- as_fn_error $? "Unable to locate ar(1) or suitable replacement. Check PATH or set AR." "$LINENO" 5
+ as_fn_error "Unable to locate ar(1) or suitable replacement. Check PATH or set AR." "$LINENO" 5
fi
fi
@@ -5441,7 +5515,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -5481,7 +5555,7 @@ if test -z "$ac_cv_prog_CC"; then
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -5534,7 +5608,7 @@ if test -z "$CC"; then
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -5574,7 +5648,7 @@ if test -z "$CC"; then
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -5633,7 +5707,7 @@ if test -z "$CC"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -5677,7 +5751,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -5731,8 +5805,8 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -5846,8 +5920,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -5889,8 +5964,8 @@ done
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -5947,9 +6022,9 @@ $as_echo "$ac_try_echo"; } >&5
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+as_fn_error "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details." "$LINENO" 5; }
fi
fi
fi
@@ -5960,7 +6035,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6000,8 +6075,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -6011,7 +6086,7 @@ OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6048,7 +6123,7 @@ ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -6126,7 +6201,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -6225,7 +6300,7 @@ depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -6332,7 +6407,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${lt_cv_path_SED+:} false; then :
+if test "${lt_cv_path_SED+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Loop through the user's path and test for sed and gsed.
@@ -6389,7 +6464,7 @@ $as_echo "$SED" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
+if test "${ac_cv_path_GREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -6438,7 +6513,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
@@ -6452,7 +6527,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -6504,7 +6579,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@ -6564,7 +6639,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if ${lt_cv_path_LD+:} false; then :
+if test "${lt_cv_path_LD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
@@ -6601,10 +6676,10 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -6624,7 +6699,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_reload_flag='-r'
@@ -6649,7 +6724,7 @@ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5
$as_echo_n "checking for BSD-compatible nm... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
+if test "${lt_cv_path_NM+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
@@ -6706,7 +6781,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognise dependent libraries" >&5
$as_echo_n "checking how to recognise dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -6923,7 +6998,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6926 "configure"' > conftest.$ac_ext
+ echo '#line 7001 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7010,7 +7085,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
CFLAGS="$CFLAGS -belf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_ext=c
@@ -7057,7 +7132,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DLLTOOL"; then
@@ -7097,7 +7172,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
set dummy dlltool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLTOOL"; then
@@ -7149,7 +7224,7 @@ fi
set dummy ${ac_tool_prefix}as; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AS+:} false; then :
+if test "${ac_cv_prog_AS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AS"; then
@@ -7189,7 +7264,7 @@ if test -z "$ac_cv_prog_AS"; then
set dummy as; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AS+:} false; then :
+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AS"; then
@@ -7241,7 +7316,7 @@ fi
set dummy ${ac_tool_prefix}objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
@@ -7281,7 +7356,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
set dummy objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
@@ -7347,7 +7422,7 @@ if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
+ if test "${ac_cv_prog_CPP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -7377,7 +7452,7 @@ else
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -7393,11 +7468,11 @@ else
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -7436,7 +7511,7 @@ else
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -7452,18 +7527,18 @@ else
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
fi
ac_ext=c
@@ -7475,7 +7550,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7592,7 +7667,8 @@ do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -7605,7 +7681,7 @@ done
for ac_header in dlfcn.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DLFCN_H 1
_ACEOF
@@ -7620,7 +7696,7 @@ done
# find the maximum length of command line arguments
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
$as_echo_n "(cached) " >&6
else
i=0
@@ -7723,7 +7799,7 @@ fi
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -7926,7 +8002,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
$as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
+if test "${lt_cv_objdir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
@@ -7993,7 +8069,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}ar; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+if test "${ac_cv_prog_AR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
@@ -8033,7 +8109,7 @@ if test -z "$ac_cv_prog_AR"; then
set dummy ar; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
@@ -8085,7 +8161,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
@@ -8125,7 +8201,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
set dummy ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
@@ -8177,7 +8253,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -8217,7 +8293,7 @@ if test -z "$ac_cv_prog_STRIP"; then
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -8319,7 +8395,7 @@ file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -8381,7 +8457,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -8541,7 +8617,7 @@ fi
#
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_prog_compiler_static works" >&5
$as_echo_n "checking if $compiler static flag $lt_prog_compiler_static works... " >&6; }
-if ${lt_prog_compiler_static_works+:} false; then :
+if test "${lt_prog_compiler_static_works+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_prog_compiler_static_works=no
@@ -8587,7 +8663,7 @@ if test "$GCC" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
@@ -8603,11 +8679,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8606: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8682: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8610: \$? = $ac_status" >&5
+ echo "$as_me:8686: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8849,7 +8925,7 @@ if test -n "$lt_prog_compiler_pic"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_prog_compiler_pic_works+:} false; then :
+if test "${lt_prog_compiler_pic_works+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_prog_compiler_pic_works=no
@@ -8865,11 +8941,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8868: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8944: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8872: \$? = $ac_status" >&5
+ echo "$as_me:8948: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8908,7 +8984,7 @@ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
@@ -8927,11 +9003,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8930: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9006: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8934: \$? = $ac_status" >&5
+ echo "$as_me:9010: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10541,7 +10617,7 @@ else
# if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10575,7 +10651,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
@@ -10589,12 +10665,12 @@ fi
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
+if test "x$ac_cv_func_shl_load" = x""yes; then :
lt_cv_dlopen="shl_load"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10628,16 +10704,16 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
else
ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
+if test "x$ac_cv_func_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10671,12 +10747,12 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10710,12 +10786,12 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10749,7 +10825,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
@@ -10790,7 +10866,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
+if test "${lt_cv_dlopen_self+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -10799,7 +10875,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <&6; }
LDFLAGS="$LDFLAGS $link_static_flag"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -10897,7 +10973,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <&2;}
# Check whether tagname contains only valid characters
case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
"") ;;
- *) as_fn_error $? "invalid tag name: $tagname" "$LINENO" 5
+ *) as_fn_error "invalid tag name: $tagname" "$LINENO" 5
;;
esac
if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
then
- as_fn_error $? "tag name \"$tagname\" already exists" "$LINENO" 5
+ as_fn_error "tag name \"$tagname\" already exists" "$LINENO" 5
fi
# Update the list of available tags.
@@ -12070,7 +12146,7 @@ CC="$lt_save_CC"
;;
*)
- as_fn_error $? "Unsupported tag name: $tagname" "$LINENO" 5
+ as_fn_error "Unsupported tag name: $tagname" "$LINENO" 5
;;
esac
@@ -12088,7 +12164,7 @@ CC="$lt_save_CC"
chmod +x "$ofile"
else
rm -f "${ofile}T"
- as_fn_error $? "unable to update list of available tagged configurations." "$LINENO" 5
+ as_fn_error "unable to update list of available tagged configurations." "$LINENO" 5
fi
fi
@@ -12117,7 +12193,7 @@ if test $ol_enable_perl != no ; then
set dummy perl; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PERLBIN+:} false; then :
+if test "${ac_cv_path_PERLBIN+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PERLBIN in
@@ -12157,7 +12233,7 @@ fi
if test "no$PERLBIN" = "no" ; then
if test $ol_enable_perl = yes ; then
- as_fn_error $? "could not locate perl" "$LINENO" 5
+ as_fn_error "could not locate perl" "$LINENO" 5
fi
else
@@ -12185,7 +12261,7 @@ if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
+ if test "${ac_cv_prog_CPP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -12215,7 +12291,7 @@ else
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -12231,11 +12307,11 @@ else
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -12274,7 +12350,7 @@ else
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -12290,18 +12366,18 @@ else
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
fi
ac_ext=c
@@ -12312,7 +12388,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using MS Visual C++" >&5
$as_echo_n "checking whether we are using MS Visual C++... " >&6; }
-if ${ol_cv_msvc+:} false; then :
+if test "${ol_cv_msvc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12328,7 +12404,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
ol_cv_msvc=no
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ol_cv_msvc" >&5
$as_echo "$ol_cv_msvc" >&6; }
@@ -12349,7 +12425,7 @@ _ACEOF
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for be_app in -lbe" >&5
$as_echo_n "checking for be_app in -lbe... " >&6; }
-if ${ac_cv_lib_be_be_app+:} false; then :
+if test "${ac_cv_lib_be_be_app+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -12383,7 +12459,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_be_be_app" >&5
$as_echo "$ac_cv_lib_be_be_app" >&6; }
-if test "x$ac_cv_lib_be_be_app" = xyes; then :
+if test "x$ac_cv_lib_be_be_app" = x""yes; then :
LIBS="$LIBS -lbe -lroot -lnet"
else
:
@@ -12400,7 +12476,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -12440,7 +12516,7 @@ if test -z "$ac_cv_prog_CC"; then
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -12493,7 +12569,7 @@ if test -z "$CC"; then
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -12533,7 +12609,7 @@ if test -z "$CC"; then
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -12592,7 +12668,7 @@ if test -z "$CC"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -12636,7 +12712,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -12690,8 +12766,8 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -12720,7 +12796,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12757,7 +12833,7 @@ ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -12835,7 +12911,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -12934,7 +13010,7 @@ depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -13040,7 +13116,7 @@ fi
if test "X${ac_cv_prog_cc_stdc}" = "Xno" ; then
- as_fn_error $? "OpenLDAP requires compiler to support STDC constructs." "$LINENO" 5
+ as_fn_error "OpenLDAP requires compiler to support STDC constructs." "$LINENO" 5
fi
# test for make depend flag
@@ -13051,7 +13127,7 @@ if test -z "${MKDEP}"; then
if test -z "${MKDEP_FLAGS}"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${OL_MKDEP} depend flag" >&5
$as_echo_n "checking for ${OL_MKDEP} depend flag... " >&6; }
-if ${ol_cv_mkdep+:} false; then :
+if test "${ol_cv_mkdep+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -13101,7 +13177,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for afopen in -ls" >&5
$as_echo_n "checking for afopen in -ls... " >&6; }
-if ${ac_cv_lib_s_afopen+:} false; then :
+if test "${ac_cv_lib_s_afopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13135,7 +13211,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_s_afopen" >&5
$as_echo "$ac_cv_lib_s_afopen" >&6; }
-if test "x$ac_cv_lib_s_afopen" = xyes; then :
+if test "x$ac_cv_lib_s_afopen" = x""yes; then :
AUTH_LIBS=-ls
@@ -13160,7 +13236,7 @@ if test $ol_enable_modules != no ; then
for ac_header in ltdl.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
-if test "x$ac_cv_header_ltdl_h" = xyes; then :
+if test "x$ac_cv_header_ltdl_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LTDL_H 1
_ACEOF
@@ -13171,12 +13247,12 @@ done
if test $ac_cv_header_ltdl_h = no ; then
- as_fn_error $? "could not locate libtool ltdl.h" "$LINENO" 5
+ as_fn_error "could not locate libtool ltdl.h" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlinit in -lltdl" >&5
$as_echo_n "checking for lt_dlinit in -lltdl... " >&6; }
-if ${ac_cv_lib_ltdl_lt_dlinit+:} false; then :
+if test "${ac_cv_lib_ltdl_lt_dlinit+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13210,7 +13286,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ltdl_lt_dlinit" >&5
$as_echo "$ac_cv_lib_ltdl_lt_dlinit" >&6; }
-if test "x$ac_cv_lib_ltdl_lt_dlinit" = xyes; then :
+if test "x$ac_cv_lib_ltdl_lt_dlinit" = x""yes; then :
MODULES_LIBS=-lltdl
@@ -13221,7 +13297,7 @@ fi
if test "$ac_cv_lib_ltdl_lt_dlinit" = no ; then
- as_fn_error $? "could not locate libtool -lltdl" "$LINENO" 5
+ as_fn_error "could not locate libtool -lltdl" "$LINENO" 5
fi
ol_link_modules=yes
WITH_MODULES_ENABLED=yes
@@ -13248,7 +13324,7 @@ fi
# test for EBCDIC
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EBCDIC" >&5
$as_echo_n "checking for EBCDIC... " >&6; }
-if ${ol_cv_cpp_ebcdic+:} false; then :
+if test "${ol_cv_cpp_ebcdic+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -13265,7 +13341,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
ol_cv_cpp_ebcdic=no
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ol_cv_cpp_ebcdic" >&5
$as_echo "$ol_cv_cpp_ebcdic" >&6; }
@@ -13277,7 +13353,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ol_cv_header_stdc+:} false; then :
+if test "${ol_cv_header_stdc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13292,7 +13368,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
ol_cv_header_stdc=no
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if test $ol_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -13381,7 +13457,7 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if eval \${$as_ac_Header+:} false; then :
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13408,7 +13484,8 @@ fi
eval ac_res=\$$as_ac_Header
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
_ACEOF
@@ -13421,7 +13498,7 @@ done
if test $ac_header_dirent = dirent.h; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
+if test "${ac_cv_search_opendir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -13455,11 +13532,11 @@ for ac_lib in '' dir; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if ${ac_cv_search_opendir+:} false; then :
+ if test "${ac_cv_search_opendir+set}" = set; then :
break
fi
done
-if ${ac_cv_search_opendir+:} false; then :
+if test "${ac_cv_search_opendir+set}" = set; then :
else
ac_cv_search_opendir=no
@@ -13478,7 +13555,7 @@ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
+if test "${ac_cv_search_opendir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -13512,11 +13589,11 @@ for ac_lib in '' x; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if ${ac_cv_search_opendir+:} false; then :
+ if test "${ac_cv_search_opendir+set}" = set; then :
break
fi
done
-if ${ac_cv_search_opendir+:} false; then :
+if test "${ac_cv_search_opendir+set}" = set; then :
else
ac_cv_search_opendir=no
@@ -13536,7 +13613,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if ${ac_cv_header_sys_wait_h+:} false; then :
+if test "${ac_cv_header_sys_wait_h+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13577,7 +13654,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether termios.h defines TIOCGWINSZ" >&5
$as_echo_n "checking whether termios.h defines TIOCGWINSZ... " >&6; }
-if ${ac_cv_sys_tiocgwinsz_in_termios_h+:} false; then :
+if test "${ac_cv_sys_tiocgwinsz_in_termios_h+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13604,7 +13681,7 @@ $as_echo "$ac_cv_sys_tiocgwinsz_in_termios_h" >&6; }
if test $ac_cv_sys_tiocgwinsz_in_termios_h != yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/ioctl.h defines TIOCGWINSZ" >&5
$as_echo_n "checking whether sys/ioctl.h defines TIOCGWINSZ... " >&6; }
-if ${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+:} false; then :
+if test "${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13688,7 +13765,8 @@ for ac_header in \
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -13706,7 +13784,8 @@ then
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -13723,7 +13802,7 @@ do :
#include
"
-if test "x$ac_cv_header_resolv_h" = xyes; then :
+if test "x$ac_cv_header_resolv_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_RESOLV_H 1
_ACEOF
@@ -13739,7 +13818,7 @@ do :
#include
"
-if test "x$ac_cv_header_netinet_tcp_h" = xyes; then :
+if test "x$ac_cv_header_netinet_tcp_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_NETINET_TCP_H 1
_ACEOF
@@ -13757,7 +13836,7 @@ do :
#endif
"
-if test "x$ac_cv_header_sys_ucred_h" = xyes; then :
+if test "x$ac_cv_header_sys_ucred_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_UCRED_H 1
_ACEOF
@@ -13772,7 +13851,8 @@ for ac_func in sigaction sigset
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -13784,7 +13864,7 @@ done
if test $ac_cv_func_sigaction = no && test $ac_cv_func_sigaction = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigset in -lV3" >&5
$as_echo_n "checking for sigset in -lV3... " >&6; }
-if ${ac_cv_lib_V3_sigset+:} false; then :
+if test "${ac_cv_lib_V3_sigset+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13818,7 +13898,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_V3_sigset" >&5
$as_echo "$ac_cv_lib_V3_sigset" >&6; }
-if test "x$ac_cv_lib_V3_sigset" = xyes; then :
+if test "x$ac_cv_lib_V3_sigset" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBV3 1
_ACEOF
@@ -13836,7 +13916,7 @@ fi
if test "$ac_cv_header_winsock_h" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for winsock" >&5
$as_echo_n "checking for winsock... " >&6; }
-if ${ol_cv_winsock+:} false; then :
+if test "${ol_cv_winsock+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -13901,13 +13981,13 @@ fi
ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
-if test "x$ac_cv_func_socket" = xyes; then :
+if test "x$ac_cv_func_socket" = x""yes; then :
:
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lsocket" >&5
$as_echo_n "checking for main in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_main+:} false; then :
+if test "${ac_cv_lib_socket_main+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13935,7 +14015,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_main" >&5
$as_echo "$ac_cv_lib_socket_main" >&6; }
-if test "x$ac_cv_lib_socket_main" = xyes; then :
+if test "x$ac_cv_lib_socket_main" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSOCKET 1
_ACEOF
@@ -13946,7 +14026,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnet" >&5
$as_echo_n "checking for socket in -lnet... " >&6; }
-if ${ac_cv_lib_net_socket+:} false; then :
+if test "${ac_cv_lib_net_socket+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13980,7 +14060,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_net_socket" >&5
$as_echo "$ac_cv_lib_net_socket" >&6; }
-if test "x$ac_cv_lib_net_socket" = xyes; then :
+if test "x$ac_cv_lib_net_socket" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNET 1
_ACEOF
@@ -13991,7 +14071,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnsl_s" >&5
$as_echo_n "checking for main in -lnsl_s... " >&6; }
-if ${ac_cv_lib_nsl_s_main+:} false; then :
+if test "${ac_cv_lib_nsl_s_main+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -14019,7 +14099,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_s_main" >&5
$as_echo "$ac_cv_lib_nsl_s_main" >&6; }
-if test "x$ac_cv_lib_nsl_s_main" = xyes; then :
+if test "x$ac_cv_lib_nsl_s_main" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNSL_S 1
_ACEOF
@@ -14030,7 +14110,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnsl" >&5
$as_echo_n "checking for main in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_main+:} false; then :
+if test "${ac_cv_lib_nsl_main+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -14058,7 +14138,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_main" >&5
$as_echo "$ac_cv_lib_nsl_main" >&6; }
-if test "x$ac_cv_lib_nsl_main" = xyes; then :
+if test "x$ac_cv_lib_nsl_main" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNSL 1
_ACEOF
@@ -14069,7 +14149,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -linet" >&5
$as_echo_n "checking for socket in -linet... " >&6; }
-if ${ac_cv_lib_inet_socket+:} false; then :
+if test "${ac_cv_lib_inet_socket+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -14103,7 +14183,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet_socket" >&5
$as_echo "$ac_cv_lib_inet_socket" >&6; }
-if test "x$ac_cv_lib_inet_socket" = xyes; then :
+if test "x$ac_cv_lib_inet_socket" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBINET 1
_ACEOF
@@ -14114,7 +14194,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgen" >&5
$as_echo_n "checking for main in -lgen... " >&6; }
-if ${ac_cv_lib_gen_main+:} false; then :
+if test "${ac_cv_lib_gen_main+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -14142,7 +14222,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gen_main" >&5
$as_echo "$ac_cv_lib_gen_main" >&6; }
-if test "x$ac_cv_lib_gen_main" = xyes; then :
+if test "x$ac_cv_lib_gen_main" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGEN 1
_ACEOF
@@ -14156,10 +14236,10 @@ fi
ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select"
-if test "x$ac_cv_func_select" = xyes; then :
+if test "x$ac_cv_func_select" = x""yes; then :
:
else
- as_fn_error $? "select() required." "$LINENO" 5
+ as_fn_error "select() required." "$LINENO" 5
fi
@@ -14168,7 +14248,8 @@ if test "${ac_cv_header_winsock_h}" != yes; then
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -14179,7 +14260,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5
$as_echo_n "checking types of arguments for select... " >&6; }
-if ${ac_cv_func_select_args+:} false; then :
+if test "${ac_cv_func_select_args+set}" = set; then :
$as_echo_n "(cached) " >&6
else
for ac_arg234 in 'fd_set *' 'int *' 'void *'; do
@@ -14213,7 +14294,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
done
# Provide a safe default value.
-: "${ac_cv_func_select_args=int,int *,struct timeval *}"
+: ${ac_cv_func_select_args='int,int *,struct timeval *'}
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5
@@ -14246,7 +14327,8 @@ for ac_func in poll
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -14259,7 +14341,8 @@ for ac_header in poll.h sys/poll.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -14274,7 +14357,8 @@ for ac_header in sys/epoll.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -14314,11 +14398,57 @@ fi
fi
+for ac_header in sys/event.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+if test "${ac_cv_header_sys_event_h}" = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kqueue system call" >&5
+$as_echo_n "checking for kqueue system call... " >&6; }
+if test "$cross_compiling" = yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int main(int argc, char **argv)
+{
+ int kqfd = kqueue();
+ exit (kqfd == -1 ? 1 : 0);
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_KQUEUE 1" >>confdefs.h
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+
for ac_header in sys/devpoll.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -14362,7 +14492,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking declaration of sys_errlist" >&5
$as_echo_n "checking declaration of sys_errlist... " >&6; }
-if ${ol_cv_dcl_sys_errlist+:} false; then :
+if test "${ol_cv_dcl_sys_errlist+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -14402,7 +14532,7 @@ $as_echo "#define DECL_SYS_ERRLIST 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking existence of sys_errlist" >&5
$as_echo_n "checking existence of sys_errlist... " >&6; }
-if ${ol_cv_have_sys_errlist+:} false; then :
+if test "${ol_cv_have_sys_errlist+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -14437,7 +14567,8 @@ fi
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -14449,7 +14580,7 @@ ol_cv_func_strerror_r=no
if test "${ac_cv_func_strerror_r}" = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking non-posix strerror_r" >&5
$as_echo_n "checking non-posix strerror_r... " >&6; }
-if ${ol_cv_nonposix_strerror_r+:} false; then :
+if test "${ol_cv_nonposix_strerror_r+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -14525,7 +14656,7 @@ fi
elif test "${ac_cv_func_strerror}" = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking declaration of sys_errlist" >&5
$as_echo_n "checking declaration of sys_errlist... " >&6; }
-if ${ol_cv_dcl_sys_errlist+:} false; then :
+if test "${ol_cv_dcl_sys_errlist+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -14565,7 +14696,7 @@ $as_echo "#define DECL_SYS_ERRLIST 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking existence of sys_errlist" >&5
$as_echo_n "checking existence of sys_errlist... " >&6; }
-if ${ol_cv_have_sys_errlist+:} false; then :
+if test "${ol_cv_have_sys_errlist+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -14608,7 +14739,7 @@ do :
#endif
"
-if test "x$ac_cv_header_regex_h" = xyes; then :
+if test "x$ac_cv_header_regex_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_REGEX_H 1
_ACEOF
@@ -14619,11 +14750,11 @@ done
if test "$ac_cv_header_regex_h" != yes ; then
- as_fn_error $? "POSIX regex.h required." "$LINENO" 5
+ as_fn_error "POSIX regex.h required." "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regfree" >&5
$as_echo_n "checking for library containing regfree... " >&6; }
-if ${ac_cv_search_regfree+:} false; then :
+if test "${ac_cv_search_regfree+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -14657,11 +14788,11 @@ for ac_lib in '' regex gnuregex; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if ${ac_cv_search_regfree+:} false; then :
+ if test "${ac_cv_search_regfree+set}" = set; then :
break
fi
done
-if ${ac_cv_search_regfree+:} false; then :
+if test "${ac_cv_search_regfree+set}" = set; then :
else
ac_cv_search_regfree=no
@@ -14676,14 +14807,14 @@ if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
:
else
- as_fn_error $? "POSIX regex required." "$LINENO" 5
+ as_fn_error "POSIX regex required." "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compatible POSIX regex" >&5
$as_echo_n "checking for compatible POSIX regex... " >&6; }
-if ${ol_cv_c_posix_regex+:} false; then :
+if test "${ol_cv_c_posix_regex+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -14730,7 +14861,7 @@ fi
$as_echo "$ol_cv_c_posix_regex" >&6; }
if test "$ol_cv_c_posix_regex" = no ; then
- as_fn_error $? "broken POSIX regex!" "$LINENO" 5
+ as_fn_error "broken POSIX regex!" "$LINENO" 5
fi
@@ -14738,7 +14869,7 @@ have_uuid=no
for ac_header in sys/uuid.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/uuid.h" "ac_cv_header_sys_uuid_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_uuid_h" = xyes; then :
+if test "x$ac_cv_header_sys_uuid_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_UUID_H 1
_ACEOF
@@ -14751,7 +14882,7 @@ if test $ac_cv_header_sys_uuid_h = yes ; then
save_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_to_str" >&5
$as_echo_n "checking for library containing uuid_to_str... " >&6; }
-if ${ac_cv_search_uuid_to_str+:} false; then :
+if test "${ac_cv_search_uuid_to_str+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -14785,11 +14916,11 @@ for ac_lib in '' uuid; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if ${ac_cv_search_uuid_to_str+:} false; then :
+ if test "${ac_cv_search_uuid_to_str+set}" = set; then :
break
fi
done
-if ${ac_cv_search_uuid_to_str+:} false; then :
+if test "${ac_cv_search_uuid_to_str+set}" = set; then :
else
ac_cv_search_uuid_to_str=no
@@ -14809,7 +14940,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_create" >&5
$as_echo_n "checking for library containing uuid_create... " >&6; }
-if ${ac_cv_search_uuid_create+:} false; then :
+if test "${ac_cv_search_uuid_create+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -14843,11 +14974,11 @@ for ac_lib in '' uuid; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if ${ac_cv_search_uuid_create+:} false; then :
+ if test "${ac_cv_search_uuid_create+set}" = set; then :
break
fi
done
-if ${ac_cv_search_uuid_create+:} false; then :
+if test "${ac_cv_search_uuid_create+set}" = set; then :
else
ac_cv_search_uuid_create=no
@@ -14881,7 +15012,7 @@ if test $have_uuid = no ; then
for ac_header in uuid/uuid.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
-if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
+if test "x$ac_cv_header_uuid_uuid_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_UUID_UUID_H 1
_ACEOF
@@ -14894,7 +15025,7 @@ done
save_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_generate" >&5
$as_echo_n "checking for library containing uuid_generate... " >&6; }
-if ${ac_cv_search_uuid_generate+:} false; then :
+if test "${ac_cv_search_uuid_generate+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -14928,11 +15059,11 @@ for ac_lib in '' uuid; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if ${ac_cv_search_uuid_generate+:} false; then :
+ if test "${ac_cv_search_uuid_generate+set}" = set; then :
break
fi
done
-if ${ac_cv_search_uuid_generate+:} false; then :
+if test "${ac_cv_search_uuid_generate+set}" = set; then :
else
ac_cv_search_uuid_generate=no
@@ -14952,7 +15083,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_unparse_lower" >&5
$as_echo_n "checking for library containing uuid_unparse_lower... " >&6; }
-if ${ac_cv_search_uuid_unparse_lower+:} false; then :
+if test "${ac_cv_search_uuid_unparse_lower+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -14986,11 +15117,11 @@ for ac_lib in '' uuid; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if ${ac_cv_search_uuid_unparse_lower+:} false; then :
+ if test "${ac_cv_search_uuid_unparse_lower+set}" = set; then :
break
fi
done
-if ${ac_cv_search_uuid_unparse_lower+:} false; then :
+if test "${ac_cv_search_uuid_unparse_lower+set}" = set; then :
else
ac_cv_search_uuid_unparse_lower=no
@@ -15062,7 +15193,7 @@ ol_cv_lib_resolver=no
if test $ol_cv_lib_resolver = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolver link (default)" >&5
$as_echo_n "checking for resolver link (default)... " >&6; }
-if ${ol_cv_resolver_none+:} false; then :
+if test "${ol_cv_resolver_none+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -15143,7 +15274,7 @@ fi
if test $ol_cv_lib_resolver = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolver link (-lresolv)" >&5
$as_echo_n "checking for resolver link (-lresolv)... " >&6; }
-if ${ol_cv_resolver_resolv+:} false; then :
+if test "${ol_cv_resolver_resolv+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -15224,7 +15355,7 @@ fi
if test $ol_cv_lib_resolver = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolver link (-lbind)" >&5
$as_echo_n "checking for resolver link (-lbind)... " >&6; }
-if ${ol_cv_resolver_bind+:} false; then :
+if test "${ol_cv_resolver_bind+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -15321,7 +15452,7 @@ fi
if test "$ol_enable_dnssrv" = yes || test "$ol_enable_dnssrv" = mod ; then
if test "$ol_link_dnssrv" = no ; then
- as_fn_error $? "DNSSRV requires res_query()" "$LINENO" 5
+ as_fn_error "DNSSRV requires res_query()" "$LINENO" 5
fi
else
ol_enable_dnssrv=no
@@ -15331,7 +15462,8 @@ for ac_func in hstrerror
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -15344,7 +15476,8 @@ for ac_func in getaddrinfo getnameinfo gai_strerror inet_ntop
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -15356,12 +15489,12 @@ done
ol_link_ipv6=no
if test $ac_cv_func_getaddrinfo = no || test $ac_cv_func_inet_ntop = no ; then
if test $ol_enable_ipv6 = yes ; then
- as_fn_error $? "IPv6 support requires getaddrinfo() and inet_ntop()" "$LINENO" 5
+ as_fn_error "IPv6 support requires getaddrinfo() and inet_ntop()" "$LINENO" 5
fi
elif test $ol_enable_ipv6 != no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking INET6_ADDRSTRLEN" >&5
$as_echo_n "checking INET6_ADDRSTRLEN... " >&6; }
-if ${ol_cv_inet6_addrstrlen+:} false; then :
+if test "${ol_cv_inet6_addrstrlen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -15389,7 +15522,7 @@ $as_echo "$ol_cv_inet6_addrstrlen" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking struct sockaddr_storage" >&5
$as_echo_n "checking struct sockaddr_storage... " >&6; }
-if ${ol_cv_struct_sockaddr_storage+:} false; then :
+if test "${ol_cv_struct_sockaddr_storage+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -15424,10 +15557,10 @@ $as_echo "$ol_cv_struct_sockaddr_storage" >&6; }
ol_link_ipv6=yes
elif test $ol_enable_ipv6 = yes &&
test $ol_cv_inet6_addrstrlen = no ; then
- as_fn_error $? "IPv6 support requires INET6_ADDRSTRLEN" "$LINENO" 5
+ as_fn_error "IPv6 support requires INET6_ADDRSTRLEN" "$LINENO" 5
elif test $ol_enable_ipv6 = yes &&
test $ol_cv_struct_sockaddr_storage = no ; then
- as_fn_error $? "IPv6 support requires struct sockaddr_storage" "$LINENO" 5
+ as_fn_error "IPv6 support requires struct sockaddr_storage" "$LINENO" 5
fi
fi
@@ -15436,7 +15569,8 @@ if test $ol_enable_local != no ; then
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -15449,7 +15583,7 @@ done
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
- as_fn_error $? "AF_LOCAL domain support requires sys/un.h" "$LINENO" 5
+ as_fn_error "AF_LOCAL domain support requires sys/un.h" "$LINENO" 5
fi
fi
@@ -15463,7 +15597,7 @@ if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then
for ac_header in openssl/ssl.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
+if test "x$ac_cv_header_openssl_ssl_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENSSL_SSL_H 1
_ACEOF
@@ -15474,9 +15608,9 @@ done
if test $ac_cv_header_openssl_ssl_h = yes ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_msg_callback in -lssl" >&5
+$as_echo_n "checking for SSL_CTX_set_msg_callback in -lssl... " >&6; }
+if test "${ac_cv_lib_ssl_SSL_CTX_set_msg_callback+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -15490,27 +15624,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char SSL_library_init ();
+char SSL_CTX_set_msg_callback ();
int
main ()
{
-return SSL_library_init ();
+return SSL_CTX_set_msg_callback ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ssl_SSL_library_init=yes
+ ac_cv_lib_ssl_SSL_CTX_set_msg_callback=yes
else
- ac_cv_lib_ssl_SSL_library_init=no
+ ac_cv_lib_ssl_SSL_CTX_set_msg_callback=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_set_msg_callback" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_CTX_set_msg_callback" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_CTX_set_msg_callback" = x""yes; then :
have_openssl=yes
need_rsaref=no
else
@@ -15521,7 +15655,7 @@ fi
if test $have_openssl = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssl3_accept in -lssl" >&5
$as_echo_n "checking for ssl3_accept in -lssl... " >&6; }
-if ${ac_cv_lib_ssl_ssl3_accept+:} false; then :
+if test "${ac_cv_lib_ssl_ssl3_accept+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -15555,7 +15689,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_ssl3_accept" >&5
$as_echo "$ac_cv_lib_ssl_ssl3_accept" >&6; }
-if test "x$ac_cv_lib_ssl_ssl3_accept" = xyes; then :
+if test "x$ac_cv_lib_ssl_ssl3_accept" = x""yes; then :
have_openssl=yes
need_rsaref=yes
else
@@ -15584,7 +15718,7 @@ $as_echo "#define HAVE_RSAREF 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL library version (CRL checking capability)" >&5
$as_echo_n "checking OpenSSL library version (CRL checking capability)... " >&6; }
-if ${ol_cv_ssl_crl_compat+:} false; then :
+if test "${ol_cv_ssl_crl_compat+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -15627,7 +15761,7 @@ if test $ol_link_tls = no ; then
for ac_header in gnutls/gnutls.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
-if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then :
+if test "x$ac_cv_header_gnutls_gnutls_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GNUTLS_GNUTLS_H 1
_ACEOF
@@ -15638,9 +15772,26 @@ done
if test $ac_cv_header_gnutls_gnutls_h = yes ; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include
+#if GNUTLS_VERSION_NUMBER < 0x020c00
+#error "GnuTLS 2.12.0 or newer required"
+#endif
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "GnuTLS is too old
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+rm -f conftest.err conftest.$ac_ext
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_init in -lgnutls" >&5
$as_echo_n "checking for gnutls_init in -lgnutls... " >&6; }
-if ${ac_cv_lib_gnutls_gnutls_init+:} false; then :
+if test "${ac_cv_lib_gnutls_gnutls_init+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -15674,7 +15825,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_init" >&5
$as_echo "$ac_cv_lib_gnutls_gnutls_init" >&6; }
-if test "x$ac_cv_lib_gnutls_gnutls_init" = xyes; then :
+if test "x$ac_cv_lib_gnutls_gnutls_init" = x""yes; then :
have_gnutls=yes
else
have_gnutls=no
@@ -15701,7 +15852,7 @@ if test $ol_link_tls = no ; then
for ac_header in nssutil.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "nssutil.h" "ac_cv_header_nssutil_h" "$ac_includes_default"
-if test "x$ac_cv_header_nssutil_h" = xyes; then :
+if test "x$ac_cv_header_nssutil_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_NSSUTIL_H 1
_ACEOF
@@ -15713,7 +15864,7 @@ done
if test "$ac_cv_header_nssutil_h" = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS_Initialize in -lnss3" >&5
$as_echo_n "checking for NSS_Initialize in -lnss3... " >&6; }
-if ${ac_cv_lib_nss3_NSS_Initialize+:} false; then :
+if test "${ac_cv_lib_nss3_NSS_Initialize+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -15747,7 +15898,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nss3_NSS_Initialize" >&5
$as_echo "$ac_cv_lib_nss3_NSS_Initialize" >&6; }
-if test "x$ac_cv_lib_nss3_NSS_Initialize" = xyes; then :
+if test "x$ac_cv_lib_nss3_NSS_Initialize" = x""yes; then :
have_moznss=yes
else
have_moznss=no
@@ -15764,7 +15915,7 @@ $as_echo "#define HAVE_MOZNSS 1" >>confdefs.h
TLS_LIBS="-lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4"
else
if test $ol_with_tls = moznss ; then
- as_fn_error $? "MozNSS not found - please specify the location to the NSPR and NSS header files in CPPFLAGS and the location to the NSPR and NSS libraries in LDFLAGS (if not in the system location)" "$LINENO" 5
+ as_fn_error "MozNSS not found - please specify the location to the NSPR and NSS header files in CPPFLAGS and the location to the NSPR and NSS libraries in LDFLAGS (if not in the system location)" "$LINENO" 5
fi
fi
fi
@@ -15782,7 +15933,7 @@ $as_echo "$as_me: WARNING: Could not locate TLS/SSL package" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: TLS data protection not supported!" >&5
$as_echo "$as_me: WARNING: TLS data protection not supported!" >&2;}
elif test $ol_with_tls != no ; then
- as_fn_error $? "Could not locate TLS/SSL package" "$LINENO" 5
+ as_fn_error "Could not locate TLS/SSL package" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: TLS data protection not supported!" >&5
$as_echo "$as_me: WARNING: TLS data protection not supported!" >&2;}
@@ -15790,7 +15941,7 @@ fi
if test $ol_enable_lmpasswd != no; then
if test $ol_link_tls != yes ; then
- as_fn_error $? "LAN Manager passwords require OpenSSL" "$LINENO" 5
+ as_fn_error "LAN Manager passwords require OpenSSL" "$LINENO" 5
fi
@@ -15804,7 +15955,7 @@ case $ol_with_threads in auto | yes | nt)
ac_fn_c_check_func "$LINENO" "_beginthread" "ac_cv_func__beginthread"
-if test "x$ac_cv_func__beginthread" = xyes; then :
+if test "x$ac_cv_func__beginthread" = x""yes; then :
fi
@@ -15831,7 +15982,7 @@ $as_echo "#define HAVE_NT_EVENT_LOG 1" >>confdefs.h
fi
if test $ol_with_threads = nt ; then
- as_fn_error $? "could not locate NT Threads" "$LINENO" 5
+ as_fn_error "could not locate NT Threads" "$LINENO" 5
fi
;;
esac
@@ -15841,7 +15992,7 @@ case $ol_with_threads in auto | yes | posix)
for ac_header in pthread.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = xyes; then :
+if test "x$ac_cv_header_pthread_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PTHREAD_H 1
_ACEOF
@@ -15854,7 +16005,7 @@ done
if test $ac_cv_header_pthread_h = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking POSIX thread version" >&5
$as_echo_n "checking POSIX thread version... " >&6; }
-if ${ol_cv_pthread_version+:} false; then :
+if test "${ol_cv_pthread_version+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -15952,7 +16103,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
else
- as_fn_error $? "unknown pthread version" "$LINENO" 5
+ as_fn_error "unknown pthread version" "$LINENO" 5
fi
# consider threads found
@@ -15961,7 +16112,7 @@ _ACEOF
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LinuxThreads pthread.h" >&5
$as_echo_n "checking for LinuxThreads pthread.h... " >&6; }
-if ${ol_cv_header_linux_threads+:} false; then :
+if test "${ol_cv_header_linux_threads+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15989,7 +16140,7 @@ $as_echo "#define HAVE_LINUX_THREADS 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU Pth pthread.h" >&5
$as_echo_n "checking for GNU Pth pthread.h... " >&6; }
-if ${ol_cv_header_gnu_pth_pthread_h+:} false; then :
+if test "${ol_cv_header_gnu_pth_pthread_h+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16018,7 +16169,7 @@ $as_echo "$ol_cv_header_gnu_pth_pthread_h" >&6; }
for ac_header in sched.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sched.h" "ac_cv_header_sched_h" "$ac_includes_default"
-if test "x$ac_cv_header_sched_h" = xyes; then :
+if test "x$ac_cv_header_sched_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SCHED_H 1
_ACEOF
@@ -16032,7 +16183,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in default libraries" >&5
$as_echo_n "checking for pthread_create in default libraries... " >&6; }
-if ${ol_cv_pthread_create+:} false; then :
+if test "${ol_cv_pthread_create+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -16213,7 +16364,7 @@ if test "$ol_link_threads" = no ; then
# try -kthread
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -kthread" >&5
$as_echo_n "checking for pthread link with -kthread... " >&6; }
-if ${ol_cv_pthread_kthread+:} false; then :
+if test "${ol_cv_pthread_kthread+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -16403,7 +16554,7 @@ if test "$ol_link_threads" = no ; then
# try -pthread
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -pthread" >&5
$as_echo_n "checking for pthread link with -pthread... " >&6; }
-if ${ol_cv_pthread_pthread+:} false; then :
+if test "${ol_cv_pthread_pthread+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -16593,7 +16744,7 @@ if test "$ol_link_threads" = no ; then
# try -pthreads
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -pthreads" >&5
$as_echo_n "checking for pthread link with -pthreads... " >&6; }
-if ${ol_cv_pthread_pthreads+:} false; then :
+if test "${ol_cv_pthread_pthreads+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -16783,7 +16934,7 @@ if test "$ol_link_threads" = no ; then
# try -mthreads
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -mthreads" >&5
$as_echo_n "checking for pthread link with -mthreads... " >&6; }
-if ${ol_cv_pthread_mthreads+:} false; then :
+if test "${ol_cv_pthread_mthreads+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -16973,7 +17124,7 @@ if test "$ol_link_threads" = no ; then
# try -thread
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -thread" >&5
$as_echo_n "checking for pthread link with -thread... " >&6; }
-if ${ol_cv_pthread_thread+:} false; then :
+if test "${ol_cv_pthread_thread+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -17164,7 +17315,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthread -lmach -lexc -lc_r
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthread -lmach -lexc -lc_r" >&5
$as_echo_n "checking for pthread link with -lpthread -lmach -lexc -lc_r... " >&6; }
-if ${ol_cv_pthread_lpthread_lmach_lexc_lc_r+:} false; then :
+if test "${ol_cv_pthread_lpthread_lmach_lexc_lc_r+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -17354,7 +17505,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthread -lmach -lexc
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthread -lmach -lexc" >&5
$as_echo_n "checking for pthread link with -lpthread -lmach -lexc... " >&6; }
-if ${ol_cv_pthread_lpthread_lmach_lexc+:} false; then :
+if test "${ol_cv_pthread_lpthread_lmach_lexc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -17545,7 +17696,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthread -Wl,-woff,85
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthread -Wl,-woff,85" >&5
$as_echo_n "checking for pthread link with -lpthread -Wl,-woff,85... " >&6; }
-if ${ol_cv_pthread_lib_lpthread_woff+:} false; then :
+if test "${ol_cv_pthread_lib_lpthread_woff+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -17736,7 +17887,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthread
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthread" >&5
$as_echo_n "checking for pthread link with -lpthread... " >&6; }
-if ${ol_cv_pthread_lpthread+:} false; then :
+if test "${ol_cv_pthread_lpthread+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -17926,7 +18077,7 @@ if test "$ol_link_threads" = no ; then
# try -lc_r
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lc_r" >&5
$as_echo_n "checking for pthread link with -lc_r... " >&6; }
-if ${ol_cv_pthread_lc_r+:} false; then :
+if test "${ol_cv_pthread_lc_r+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -18117,7 +18268,7 @@ if test "$ol_link_threads" = no ; then
# try -threads
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -threads" >&5
$as_echo_n "checking for pthread link with -threads... " >&6; }
-if ${ol_cv_pthread_threads+:} false; then :
+if test "${ol_cv_pthread_threads+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -18308,7 +18459,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthreads -lmach -lexc -lc_r
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthreads -lmach -lexc -lc_r" >&5
$as_echo_n "checking for pthread link with -lpthreads -lmach -lexc -lc_r... " >&6; }
-if ${ol_cv_pthread_lpthreads_lmach_lexc_lc_r+:} false; then :
+if test "${ol_cv_pthread_lpthreads_lmach_lexc_lc_r+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -18498,7 +18649,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthreads -lmach -lexc
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthreads -lmach -lexc" >&5
$as_echo_n "checking for pthread link with -lpthreads -lmach -lexc... " >&6; }
-if ${ol_cv_pthread_lpthreads_lmach_lexc+:} false; then :
+if test "${ol_cv_pthread_lpthreads_lmach_lexc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -18688,7 +18839,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthreads -lexc
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthreads -lexc" >&5
$as_echo_n "checking for pthread link with -lpthreads -lexc... " >&6; }
-if ${ol_cv_pthread_lpthreads_lexc+:} false; then :
+if test "${ol_cv_pthread_lpthreads_lexc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -18879,7 +19030,7 @@ if test "$ol_link_threads" = no ; then
# try -lpthreads
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread link with -lpthreads" >&5
$as_echo_n "checking for pthread link with -lpthreads... " >&6; }
-if ${ol_cv_pthread_lib_lpthreads+:} false; then :
+if test "${ol_cv_pthread_lib_lpthreads+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -19076,7 +19227,8 @@ fi
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -19090,7 +19242,7 @@ done
test $ac_cv_func_thr_yield = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
$as_echo_n "checking for sched_yield in -lrt... " >&6; }
-if ${ac_cv_lib_rt_sched_yield+:} false; then :
+if test "${ac_cv_lib_rt_sched_yield+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -19124,7 +19276,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5
$as_echo "$ac_cv_lib_rt_sched_yield" >&6; }
-if test "x$ac_cv_lib_rt_sched_yield" = xyes; then :
+if test "x$ac_cv_lib_rt_sched_yield" = x""yes; then :
LTHREAD_LIBS="$LTHREAD_LIBS -lrt"
$as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h
@@ -19145,7 +19297,7 @@ $as_echo "$as_me: WARNING: could not locate sched_yield() or pthread_yield()" >&
for ac_func in pthread_kill
do :
ac_fn_c_check_func "$LINENO" "pthread_kill" "ac_cv_func_pthread_kill"
-if test "x$ac_cv_func_pthread_kill" = xyes; then :
+if test "x$ac_cv_func_pthread_kill" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PTHREAD_KILL 1
_ACEOF
@@ -19156,7 +19308,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_rwlock_destroy with " >&5
$as_echo_n "checking for pthread_rwlock_destroy with ... " >&6; }
-if ${ol_cv_func_pthread_rwlock_destroy+:} false; then :
+if test "${ol_cv_func_pthread_rwlock_destroy+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -19193,7 +19345,7 @@ $as_echo "#define HAVE_PTHREAD_RWLOCK_DESTROY 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_detach with " >&5
$as_echo_n "checking for pthread_detach with ... " >&6; }
-if ${ol_cv_func_pthread_detach+:} false; then :
+if test "${ol_cv_func_pthread_detach+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -19226,7 +19378,7 @@ fi
$as_echo "$ol_cv_func_pthread_detach" >&6; }
if test $ol_cv_func_pthread_detach = no ; then
- as_fn_error $? "could not locate pthread_detach()" "$LINENO" 5
+ as_fn_error "could not locate pthread_detach()" "$LINENO" 5
fi
@@ -19242,7 +19394,8 @@ $as_echo "#define HAVE_PTHREAD_DETACH 1" >>confdefs.h
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -19255,7 +19408,7 @@ done
for ac_func in pthread_kill_other_threads_np
do :
ac_fn_c_check_func "$LINENO" "pthread_kill_other_threads_np" "ac_cv_func_pthread_kill_other_threads_np"
-if test "x$ac_cv_func_pthread_kill_other_threads_np" = xyes; then :
+if test "x$ac_cv_func_pthread_kill_other_threads_np" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PTHREAD_KILL_OTHER_THREADS_NP 1
_ACEOF
@@ -19265,7 +19418,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LinuxThreads implementation" >&5
$as_echo_n "checking for LinuxThreads implementation... " >&6; }
-if ${ol_cv_sys_linux_threads+:} false; then :
+if test "${ol_cv_sys_linux_threads+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ol_cv_sys_linux_threads=$ac_cv_func_pthread_kill_other_threads_np
@@ -19278,7 +19431,7 @@ $as_echo "$ol_cv_sys_linux_threads" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LinuxThreads consistency" >&5
$as_echo_n "checking for LinuxThreads consistency... " >&6; }
-if ${ol_cv_linux_threads+:} false; then :
+if test "${ol_cv_linux_threads+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -19298,12 +19451,12 @@ $as_echo "$ol_cv_linux_threads" >&6; }
if test $ol_cv_linux_threads = error; then
- as_fn_error $? "LinuxThreads header/library mismatch" "$LINENO" 5;
+ as_fn_error "LinuxThreads header/library mismatch" "$LINENO" 5;
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if pthread_create() works" >&5
$as_echo_n "checking if pthread_create() works... " >&6; }
-if ${ol_cv_pthread_create_works+:} false; then :
+if test "${ol_cv_pthread_create_works+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -19397,7 +19550,7 @@ fi
$as_echo "$ol_cv_pthread_create_works" >&6; }
if test $ol_cv_pthread_create_works = no ; then
- as_fn_error $? "pthread_create is not usable, check environment settings" "$LINENO" 5
+ as_fn_error "pthread_create is not usable, check environment settings" "$LINENO" 5
fi
ol_replace_broken_yield=no
@@ -19411,7 +19564,7 @@ $as_echo "#define REPLACE_BROKEN_YIELD 1" >>confdefs.h
if test $ol_with_yielding_select = auto ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if select yields when using pthreads" >&5
$as_echo_n "checking if select yields when using pthreads... " >&6; }
-if ${ol_cv_pthread_select_yields+:} false; then :
+if test "${ol_cv_pthread_select_yields+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -19509,7 +19662,7 @@ fi
$as_echo "$ol_cv_pthread_select_yields" >&6; }
if test $ol_cv_pthread_select_yields = cross ; then
- as_fn_error $? "crossing compiling: use --with-yielding_select=yes|no|manual" "$LINENO" 5
+ as_fn_error "crossing compiling: use --with-yielding_select=yes|no|manual" "$LINENO" 5
fi
if test $ol_cv_pthread_select_yields = yes ; then
@@ -19520,12 +19673,12 @@ $as_echo "$ol_cv_pthread_select_yields" >&6; }
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
else
- as_fn_error $? "could not locate usable POSIX Threads" "$LINENO" 5
+ as_fn_error "could not locate usable POSIX Threads" "$LINENO" 5
fi
fi
if test $ol_with_threads = posix ; then
- as_fn_error $? "could not locate POSIX Threads" "$LINENO" 5
+ as_fn_error "could not locate POSIX Threads" "$LINENO" 5
fi
;;
esac
@@ -19536,7 +19689,8 @@ case $ol_with_threads in auto | yes | mach)
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -19549,7 +19703,7 @@ done
ol_with_threads=found
ac_fn_c_check_func "$LINENO" "cthread_fork" "ac_cv_func_cthread_fork"
-if test "x$ac_cv_func_cthread_fork" = xyes; then :
+if test "x$ac_cv_func_cthread_fork" = x""yes; then :
ol_link_threads=yes
fi
@@ -19557,7 +19711,7 @@ fi
if test $ol_link_threads = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cthread_fork with -all_load" >&5
$as_echo_n "checking for cthread_fork with -all_load... " >&6; }
-if ${ol_cv_cthread_all_load+:} false; then :
+if test "${ol_cv_cthread_all_load+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -19603,7 +19757,7 @@ $as_echo "$ol_cv_cthread_all_load" >&6; }
save_LIBS="$LIBS"
LIBS="$LIBS -lthreads"
ac_fn_c_check_func "$LINENO" "cthread_fork" "ac_cv_func_cthread_fork"
-if test "x$ac_cv_func_cthread_fork" = xyes; then :
+if test "x$ac_cv_func_cthread_fork" = x""yes; then :
ol_link_threads=yes
fi
@@ -19614,11 +19768,11 @@ fi
ol_link_threads=mach
ol_with_threads=found
else
- as_fn_error $? "could not link with Mach CThreads" "$LINENO" 5
+ as_fn_error "could not link with Mach CThreads" "$LINENO" 5
fi
elif test $ol_with_threads = mach ; then
- as_fn_error $? "could not locate Mach CThreads" "$LINENO" 5
+ as_fn_error "could not locate Mach CThreads" "$LINENO" 5
fi
if test $ol_link_threads = mach ; then
@@ -19626,7 +19780,7 @@ fi
$as_echo "#define HAVE_MACH_CTHREADS 1" >>confdefs.h
elif test $ol_with_threads = found ; then
- as_fn_error $? "could not link with Mach CThreads" "$LINENO" 5
+ as_fn_error "could not link with Mach CThreads" "$LINENO" 5
fi
;;
esac
@@ -19636,7 +19790,7 @@ case $ol_with_threads in auto | yes | pth)
for ac_header in pth.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "pth.h" "ac_cv_header_pth_h" "$ac_includes_default"
-if test "x$ac_cv_header_pth_h" = xyes; then :
+if test "x$ac_cv_header_pth_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PTH_H 1
_ACEOF
@@ -19649,7 +19803,7 @@ done
if test $ac_cv_header_pth_h = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pth_version in -lpth" >&5
$as_echo_n "checking for pth_version in -lpth... " >&6; }
-if ${ac_cv_lib_pth_pth_version+:} false; then :
+if test "${ac_cv_lib_pth_pth_version+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -19683,7 +19837,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pth_pth_version" >&5
$as_echo "$ac_cv_lib_pth_pth_version" >&6; }
-if test "x$ac_cv_lib_pth_pth_version" = xyes; then :
+if test "x$ac_cv_lib_pth_pth_version" = x""yes; then :
have_pth=yes
else
have_pth=no
@@ -19712,7 +19866,8 @@ case $ol_with_threads in auto | yes | lwp)
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -19725,7 +19880,7 @@ done
test $ac_cv_header_synch_h = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for thr_create in -lthread" >&5
$as_echo_n "checking for thr_create in -lthread... " >&6; }
-if ${ac_cv_lib_thread_thr_create+:} false; then :
+if test "${ac_cv_lib_thread_thr_create+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -19759,7 +19914,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_thread_thr_create" >&5
$as_echo "$ac_cv_lib_thread_thr_create" >&6; }
-if test "x$ac_cv_lib_thread_thr_create" = xyes; then :
+if test "x$ac_cv_lib_thread_thr_create" = x""yes; then :
have_thr=yes
else
have_thr=no
@@ -19784,7 +19939,8 @@ $as_echo "#define HAVE_THR 1" >>confdefs.h
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -19813,7 +19969,8 @@ $as_echo "$as_me: WARNING: thread defines and link options must be set manually"
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -19826,7 +19983,8 @@ done
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -19837,7 +19995,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LinuxThreads pthread.h" >&5
$as_echo_n "checking for LinuxThreads pthread.h... " >&6; }
-if ${ol_cv_header_linux_threads+:} false; then :
+if test "${ol_cv_header_linux_threads+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19866,7 +20024,7 @@ $as_echo "#define HAVE_LINUX_THREADS 1" >>confdefs.h
for ac_header in mach/cthreads.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "mach/cthreads.h" "ac_cv_header_mach_cthreads_h" "$ac_includes_default"
-if test "x$ac_cv_header_mach_cthreads_h" = xyes; then :
+if test "x$ac_cv_header_mach_cthreads_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MACH_CTHREADS_H 1
_ACEOF
@@ -19879,7 +20037,8 @@ done
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -19908,7 +20067,7 @@ if test $ol_link_threads != no && test $ol_link_threads != nt ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for thread specific errno" >&5
$as_echo_n "checking for thread specific errno... " >&6; }
-if ${ol_cv_errno_thread_specific+:} false; then :
+if test "${ol_cv_errno_thread_specific+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -19937,7 +20096,7 @@ $as_echo "$ol_cv_errno_thread_specific" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for thread specific h_errno" >&5
$as_echo_n "checking for thread specific h_errno... " >&6; }
-if ${ol_cv_h_errno_thread_specific+:} false; then :
+if test "${ol_cv_h_errno_thread_specific+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -19974,7 +20133,7 @@ fi
if test $ol_link_threads = no ; then
if test $ol_with_threads = yes ; then
- as_fn_error $? "no suitable thread support" "$LINENO" 5
+ as_fn_error "no suitable thread support" "$LINENO" 5
fi
if test $ol_with_threads = auto ; then
@@ -20006,7 +20165,8 @@ for ac_func in \
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -20020,7 +20180,7 @@ if test "$ac_cv_func_ctime_r" = no ; then
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking number of arguments of ctime_r" >&5
$as_echo_n "checking number of arguments of ctime_r... " >&6; }
-if ${ol_cv_func_ctime_r_nargs+:} false; then :
+if test "${ol_cv_func_ctime_r_nargs+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20090,7 +20250,7 @@ fi
if test "$ac_cv_func_gethostbyname_r" = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking number of arguments of gethostbyname_r" >&5
$as_echo_n "checking number of arguments of gethostbyname_r... " >&6; }
-if ${ol_cv_func_gethostbyname_r_nargs+:} false; then :
+if test "${ol_cv_func_gethostbyname_r_nargs+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20176,7 +20336,7 @@ fi
if test "$ac_cv_func_gethostbyaddr_r" = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking number of arguments of gethostbyaddr_r" >&5
$as_echo_n "checking number of arguments of gethostbyaddr_r... " >&6; }
-if ${ol_cv_func_gethostbyaddr_r_nargs+:} false; then :
+if test "${ol_cv_func_gethostbyaddr_r_nargs+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20266,12 +20426,12 @@ fi
ol_link_bdb=no
-if test $ol_enable_deprecated_bdb/$ol_enable_deprecated_hdb != no/no; then
+if test $ol_enable_bdb/$ol_enable_hdb != no/no; then
ol_cv_berkeley_db=no
for ac_header in db.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "db.h" "ac_cv_header_db_h" "$ac_includes_default"
-if test "x$ac_cv_header_db_h" = xyes; then :
+if test "x$ac_cv_header_db_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DB_H 1
_ACEOF
@@ -20283,7 +20443,7 @@ done
if test $ac_cv_header_db_h = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB major version in db.h" >&5
$as_echo_n "checking for Berkeley DB major version in db.h... " >&6; }
-if ${ol_cv_bdb_major+:} false; then :
+if test "${ol_cv_bdb_major+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -20297,19 +20457,19 @@ else
__db_version DB_VERSION_MAJOR
_ACEOF
- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
+ set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
ol_cv_bdb_major=${3}
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ol_cv_bdb_major" >&5
$as_echo "$ol_cv_bdb_major" >&6; }
case $ol_cv_bdb_major in [1-9]*) : ;; *)
- as_fn_error $? "Unknown Berkeley DB major version in db.h" "$LINENO" 5 ;;
+ as_fn_error "Unknown Berkeley DB major version in db.h" "$LINENO" 5 ;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB minor version in db.h" >&5
$as_echo_n "checking for Berkeley DB minor version in db.h... " >&6; }
-if ${ol_cv_bdb_minor+:} false; then :
+if test "${ol_cv_bdb_minor+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -20323,19 +20483,19 @@ else
__db_version DB_VERSION_MINOR
_ACEOF
- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
+ set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
ol_cv_bdb_minor=${3}
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ol_cv_bdb_minor" >&5
$as_echo "$ol_cv_bdb_minor" >&6; }
case $ol_cv_bdb_minor in [0-9]*) : ;; *)
- as_fn_error $? "Unknown Berkeley DB minor version in db.h" "$LINENO" 5 ;;
+ as_fn_error "Unknown Berkeley DB minor version in db.h" "$LINENO" 5 ;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Berkeley DB version supported by BDB/HDB backends" >&5
$as_echo_n "checking if Berkeley DB version supported by BDB/HDB backends... " >&6; }
-if ${ol_cv_bdb_compat+:} false; then :
+if test "${ol_cv_bdb_compat+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -20351,13 +20511,19 @@ else
#ifndef DB_VERSION_MINOR
# define DB_VERSION_MINOR 0
#endif
+#ifndef DB_VERSION_PATCH
+# define DB_VERSION_PATCH 0
+#endif
-#define DB_VERSION_MM ((DB_VERSION_MAJOR<<8)|DB_VERSION_MINOR)
+#define DB_VERSION_FULL ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
-/* require 4.4 or later */
-#if DB_VERSION_MM >= 0x0404
+/* require 4.4 or later, but less than 6.0.20 */
+#if DB_VERSION_FULL >= 0x040400 && DB_VERSION_FULL < 0x060014
__db_version_compat
#endif
+#if DB_VERSION_FULL >= 0x060014
+#error "BerkeleyDB 6.0.20+ license is incompatible with LDAP"
+#endif
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -20374,7 +20540,7 @@ $as_echo "$ol_cv_bdb_compat" >&6; }
if test $ol_cv_bdb_compat != yes ; then
- as_fn_error $? "BerkeleyDB version incompatible with BDB/HDB backends" "$LINENO" 5
+ as_fn_error "BerkeleyDB version incompatible with BDB/HDB backends" "$LINENO" 5
fi
ol_cv_lib_db=no
@@ -20383,7 +20549,7 @@ if test $ol_cv_bdb_major = 5 ; then
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-5.$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-5.$ol_cv_bdb_minor)... " >&6; }
-if ${ol_cv_db_db_5_dot_m+:} false; then :
+if test "${ol_cv_db_db_5_dot_m+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -20446,7 +20612,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb5$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb5$ol_cv_bdb_minor)... " >&6; }
-if ${ol_cv_db_db5m+:} false; then :
+if test "${ol_cv_db_db5m+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -20509,7 +20675,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-5$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-5$ol_cv_bdb_minor)... " >&6; }
-if ${ol_cv_db_db_5m+:} false; then :
+if test "${ol_cv_db_db_5m+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -20572,7 +20738,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-5-$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-5-$ol_cv_bdb_minor)... " >&6; }
-if ${ol_cv_db_db_5_m+:} false; then :
+if test "${ol_cv_db_db_5_m+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -20635,7 +20801,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-5)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-5)... " >&6; }
-if ${ol_cv_db_db_5+:} false; then :
+if test "${ol_cv_db_db_5+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -20698,7 +20864,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb5)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb5)... " >&6; }
-if ${ol_cv_db_db5+:} false; then :
+if test "${ol_cv_db_db5+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -20762,7 +20928,7 @@ elif test $ol_cv_bdb_major = 4 ; then
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-4.$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-4.$ol_cv_bdb_minor)... " >&6; }
-if ${ol_cv_db_db_4_dot_m+:} false; then :
+if test "${ol_cv_db_db_4_dot_m+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -20825,7 +20991,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb4$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb4$ol_cv_bdb_minor)... " >&6; }
-if ${ol_cv_db_db4m+:} false; then :
+if test "${ol_cv_db_db4m+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -20888,7 +21054,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-4$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-4$ol_cv_bdb_minor)... " >&6; }
-if ${ol_cv_db_db_4m+:} false; then :
+if test "${ol_cv_db_db_4m+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -20951,7 +21117,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-4-$ol_cv_bdb_minor)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-4-$ol_cv_bdb_minor)... " >&6; }
-if ${ol_cv_db_db_4_m+:} false; then :
+if test "${ol_cv_db_db_4_m+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -21014,7 +21180,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb-4)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb-4)... " >&6; }
-if ${ol_cv_db_db_4+:} false; then :
+if test "${ol_cv_db_db_4+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -21077,7 +21243,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb4)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb4)... " >&6; }
-if ${ol_cv_db_db4+:} false; then :
+if test "${ol_cv_db_db4+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -21141,7 +21307,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (-ldb)" >&5
$as_echo_n "checking for Berkeley DB link (-ldb)... " >&6; }
-if ${ol_cv_db_db+:} false; then :
+if test "${ol_cv_db_db+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -21204,7 +21370,7 @@ fi
if test $ol_cv_lib_db = no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB link (default)" >&5
$as_echo_n "checking for Berkeley DB link (default)... " >&6; }
-if ${ol_cv_db_none+:} false; then :
+if test "${ol_cv_db_none+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -21269,7 +21435,7 @@ fi
ol_cv_berkeley_db=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB library and header version match" >&5
$as_echo_n "checking for Berkeley DB library and header version match... " >&6; }
-if ${ol_cv_berkeley_db_version+:} false; then :
+if test "${ol_cv_berkeley_db_version+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -21335,12 +21501,12 @@ fi
$as_echo "$ol_cv_berkeley_db_version" >&6; }
if test $ol_cv_berkeley_db_version = no ; then
- as_fn_error $? "Berkeley DB version mismatch" "$LINENO" 5
+ as_fn_error "Berkeley DB version mismatch" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB thread support" >&5
$as_echo_n "checking for Berkeley DB thread support... " >&6; }
-if ${ol_cv_berkeley_db_thread+:} false; then :
+if test "${ol_cv_berkeley_db_thread+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -21447,7 +21613,7 @@ fi
if test $ol_cv_berkeley_db = no ; then
- as_fn_error $? "BDB/HDB: BerkeleyDB not available" "$LINENO" 5
+ as_fn_error "BDB/HDB: BerkeleyDB not available" "$LINENO" 5
fi
@@ -21479,7 +21645,7 @@ if test $ol_enable_wrappers != no ; then
for ac_header in tcpd.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "tcpd.h" "ac_cv_header_tcpd_h" "$ac_includes_default"
-if test "x$ac_cv_header_tcpd_h" = xyes; then :
+if test "x$ac_cv_header_tcpd_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_TCPD_H 1
_ACEOF
@@ -21564,7 +21730,7 @@ $as_echo "#define HAVE_TCPD 1" >>confdefs.h
WRAP_LIBS="-lwrap"
elif test $ol_enable_wrappers = yes ; then
- as_fn_error $? "could not find TCP wrappers, select apppropriate options or disable" "$LINENO" 5
+ as_fn_error "could not find TCP wrappers, select appropriate options or disable" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find TCP wrappers, support disabled" >&5
$as_echo "$as_me: WARNING: could not find TCP wrappers, support disabled" >&2;}
@@ -21574,12 +21740,13 @@ fi
if test $ol_enable_syslog != no ; then
ac_fn_c_check_func "$LINENO" "openlog" "ac_cv_func_openlog"
-if test "x$ac_cv_func_openlog" = xyes; then :
+if test "x$ac_cv_func_openlog" = x""yes; then :
fi
if test $ac_cv_func_openlog = no && test $ol_enable_syslog = yes; then
- as_fn_error select appropriate options or disable "could not find syslog" "$LINENO" 5
+ { as_fn_set_status select appropriate options or disable
+as_fn_error "could not find syslog" "$LINENO" 5; }
fi
ol_enable_syslog=$ac_cv_func_openlog
fi
@@ -21590,14 +21757,15 @@ if test $ol_enable_sql != no ; then
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
else
- as_fn_error $? "could not locate SQL headers" "$LINENO" 5
+ as_fn_error "could not locate SQL headers" "$LINENO" 5
fi
@@ -21605,7 +21773,7 @@ done
sql_LIBS="$LIBS"
- LIBS="$LTHREAD_LIBS"
+ LIBS="$LTHREAD_LIBS $LIBS"
if test $ol_with_odbc = auto ; then
ol_with_odbc="iodbc unixodbc odbc32"
@@ -21617,7 +21785,7 @@ done
iodbc)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLDriverConnect in -liodbc" >&5
$as_echo_n "checking for SQLDriverConnect in -liodbc... " >&6; }
-if ${ac_cv_lib_iodbc_SQLDriverConnect+:} false; then :
+if test "${ac_cv_lib_iodbc_SQLDriverConnect+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -21651,7 +21819,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iodbc_SQLDriverConnect" >&5
$as_echo "$ac_cv_lib_iodbc_SQLDriverConnect" >&6; }
-if test "x$ac_cv_lib_iodbc_SQLDriverConnect" = xyes; then :
+if test "x$ac_cv_lib_iodbc_SQLDriverConnect" = x""yes; then :
have_iodbc=yes
else
have_iodbc=no
@@ -21665,7 +21833,7 @@ fi
unixodbc)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLDriverConnect in -lodbc" >&5
$as_echo_n "checking for SQLDriverConnect in -lodbc... " >&6; }
-if ${ac_cv_lib_odbc_SQLDriverConnect+:} false; then :
+if test "${ac_cv_lib_odbc_SQLDriverConnect+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -21699,7 +21867,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc_SQLDriverConnect" >&5
$as_echo "$ac_cv_lib_odbc_SQLDriverConnect" >&6; }
-if test "x$ac_cv_lib_odbc_SQLDriverConnect" = xyes; then :
+if test "x$ac_cv_lib_odbc_SQLDriverConnect" = x""yes; then :
have_odbc=yes
else
have_odbc=no
@@ -21713,7 +21881,7 @@ fi
odbc32)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLDriverConnect in -lodbc32" >&5
$as_echo_n "checking for SQLDriverConnect in -lodbc32... " >&6; }
-if ${ac_cv_lib_odbc32_SQLDriverConnect+:} false; then :
+if test "${ac_cv_lib_odbc32_SQLDriverConnect+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -21747,7 +21915,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc32_SQLDriverConnect" >&5
$as_echo "$ac_cv_lib_odbc32_SQLDriverConnect" >&6; }
-if test "x$ac_cv_lib_odbc32_SQLDriverConnect" = xyes; then :
+if test "x$ac_cv_lib_odbc32_SQLDriverConnect" = x""yes; then :
have_odbc32=yes
else
have_odbc32=no
@@ -21792,7 +21960,7 @@ $as_echo "$have_odbc32" >&6; }
;;
*)
- as_fn_error $? "unknown ODBC library" "$LINENO" 5
+ as_fn_error "unknown ODBC library" "$LINENO" 5
;;
esac
fi
@@ -21804,7 +21972,7 @@ $as_echo "$have_odbc32" >&6; }
SLAPD_SQL_LIBS="$ol_link_sql"
elif test $ol_enable_sql != auto ; then
- as_fn_error $? "could not locate suitable ODBC library" "$LINENO" 5
+ as_fn_error "could not locate suitable ODBC library" "$LINENO" 5
fi
fi
@@ -21814,7 +21982,7 @@ if test $ol_enable_ndb != no ; then
set dummy mysql_config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MYSQL+:} false; then :
+if test "${ac_cv_prog_MYSQL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$MYSQL"; then
@@ -21848,7 +22016,7 @@ fi
if test "$MYSQL" != yes ; then
- as_fn_error $? "could not locate mysql_config" "$LINENO" 5
+ as_fn_error "could not locate mysql_config" "$LINENO" 5
fi
SQL_INC=`mysql_config --include`
@@ -21866,10 +22034,10 @@ if ac_fn_c_try_cpp "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- as_fn_error $? "could not locate NdbApi headers" "$LINENO" 5
+ as_fn_error "could not locate NdbApi headers" "$LINENO" 5
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
CPPFLAGS="$save_CPPFLAGS"
SQL_LIB=`mysql_config --libs_r`
@@ -21880,7 +22048,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext
LDFLAGS="$SQL_LIB"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ndb_init in -lndbclient" >&5
$as_echo_n "checking for ndb_init in -lndbclient... " >&6; }
-if ${ac_cv_lib_ndbclient_ndb_init+:} false; then :
+if test "${ac_cv_lib_ndbclient_ndb_init+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -21914,11 +22082,11 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ndbclient_ndb_init" >&5
$as_echo "$ac_cv_lib_ndbclient_ndb_init" >&6; }
-if test "x$ac_cv_lib_ndbclient_ndb_init" = xyes; then :
+if test "x$ac_cv_lib_ndbclient_ndb_init" = x""yes; then :
: ok
else
- as_fn_error $? "could not locate ndbclient library" "$LINENO" 5
+ as_fn_error "could not locate ndbclient library" "$LINENO" 5
fi
@@ -21930,12 +22098,126 @@ fi
fi
fi
+ol_link_wt=no
+if test $ol_enable_wt != no ; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_PKGCONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$PKGCONFIG"; then
+ ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_PKGCONFIG="yes"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+PKGCONFIG=$ac_cv_prog_PKGCONFIG
+if test -n "$PKGCONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5
+$as_echo "$PKGCONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test "$PKGCONFIG" != yes ; then
+ as_fn_error "could not locate pkg-config" "$LINENO" 5
+ fi
+ WT_INCS=`pkg-config --cflags wiredtiger`
+ WT_LIBS=`pkg-config --libs wiredtiger`
+
+ save_CFLAGS="$CFLAGS"
+ save_LDFLAGS="$LDFLAGS"
+ CFLAGS="$WT_INCS"
+ CPPFLAGS="$WT_INCS"
+ LDFLAGS="$WT_LIBS"
+ for ac_header in wiredtiger.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "wiredtiger.h" "ac_cv_header_wiredtiger_h" "$ac_includes_default"
+if test "x$ac_cv_header_wiredtiger_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_WIREDTIGER_H 1
+_ACEOF
+
+fi
+
+done
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wiredtiger_version in -lwiredtiger" >&5
+$as_echo_n "checking for wiredtiger_version in -lwiredtiger... " >&6; }
+if test "${ac_cv_lib_wiredtiger_wiredtiger_version+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lwiredtiger $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char wiredtiger_version ();
+int
+main ()
+{
+return wiredtiger_version ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_wiredtiger_wiredtiger_version=yes
+else
+ ac_cv_lib_wiredtiger_wiredtiger_version=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wiredtiger_wiredtiger_version" >&5
+$as_echo "$ac_cv_lib_wiredtiger_wiredtiger_version" >&6; }
+if test "x$ac_cv_lib_wiredtiger_wiredtiger_version" = x""yes; then :
+ : ok
+else
+
+ as_fn_error "could not locate wiredtiger library" "$LINENO" 5
+
+fi
+
+ CFLAGS="$save_CFLAGS"
+ CPPFLAGS="$save_CPPFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+ SLAPD_LIBS="$SLAPD_LIBS \$(WT_LIBS)"
+ ol_link_wt=yes
+fi
+
ol_icu=no
for ac_header in unicode/utypes.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -21949,7 +22231,7 @@ if test $ac_cv_header_unicode_utypes_h = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU libraries" >&5
$as_echo_n "checking for ICU libraries... " >&6; }
-if ${ol_cv_lib_icu+:} false; then :
+if test "${ol_cv_lib_icu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -22005,7 +22287,8 @@ if test $ol_with_cyrus_sasl != no ; then
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -22019,7 +22302,7 @@ done
test $ac_cv_header_sasl_h = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_client_init in -lsasl2" >&5
$as_echo_n "checking for sasl_client_init in -lsasl2... " >&6; }
-if ${ac_cv_lib_sasl2_sasl_client_init+:} false; then :
+if test "${ac_cv_lib_sasl2_sasl_client_init+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -22053,12 +22336,12 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_sasl_client_init" >&5
$as_echo "$ac_cv_lib_sasl2_sasl_client_init" >&6; }
-if test "x$ac_cv_lib_sasl2_sasl_client_init" = xyes; then :
+if test "x$ac_cv_lib_sasl2_sasl_client_init" = x""yes; then :
ol_link_sasl="-lsasl2"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_client_init in -lsasl" >&5
$as_echo_n "checking for sasl_client_init in -lsasl... " >&6; }
-if ${ac_cv_lib_sasl_sasl_client_init+:} false; then :
+if test "${ac_cv_lib_sasl_sasl_client_init+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -22092,7 +22375,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl_sasl_client_init" >&5
$as_echo "$ac_cv_lib_sasl_sasl_client_init" >&6; }
-if test "x$ac_cv_lib_sasl_sasl_client_init" = xyes; then :
+if test "x$ac_cv_lib_sasl_sasl_client_init" = x""yes; then :
ol_link_sasl="-lsasl"
fi
@@ -22102,7 +22385,7 @@ fi
if test $ol_link_sasl = no ; then
if test $ol_with_cyrus_sasl != auto ; then
- as_fn_error $? "Could not locate Cyrus SASL" "$LINENO" 5
+ as_fn_error "Could not locate Cyrus SASL" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not locate Cyrus SASL" >&5
$as_echo "$as_me: WARNING: Could not locate Cyrus SASL" >&2;}
@@ -22116,7 +22399,7 @@ $as_echo "$as_me: WARNING: Strong authentication not supported!" >&2;}
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Cyrus SASL library version" >&5
$as_echo_n "checking Cyrus SASL library version... " >&6; }
-if ${ol_cv_sasl_compat+:} false; then :
+if test "${ol_cv_sasl_compat+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -22152,7 +22435,7 @@ $as_echo "$ol_cv_sasl_compat" >&6; }
if test $ol_cv_sasl_compat = no ; then
ol_link_sasl=no
- as_fn_error $? "Cyrus SASL library located but is incompatible" "$LINENO" 5
+ as_fn_error "Cyrus SASL library located but is incompatible" "$LINENO" 5
fi
@@ -22166,7 +22449,7 @@ $as_echo "#define HAVE_CYRUS_SASL 1" >>confdefs.h
ac_save_LIBS="$LIBS"
LIBS="$LIBS $ol_link_sasl"
ac_fn_c_check_func "$LINENO" "sasl_version" "ac_cv_func_sasl_version"
-if test "x$ac_cv_func_sasl_version" = xyes; then :
+if test "x$ac_cv_func_sasl_version" = x""yes; then :
$as_echo "#define HAVE_SASL_VERSION 1" >>confdefs.h
@@ -22215,7 +22498,7 @@ if test $ol_with_fetch != no ; then
LIBS="-lfetch -lcom_err $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking fetch(3) library" >&5
$as_echo_n "checking fetch(3) library... " >&6; }
-if ${ol_cv_lib_fetch+:} false; then :
+if test "${ol_cv_lib_fetch+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -22259,7 +22542,7 @@ fi
ol_link_fetch=freebsd
elif test $ol_with_fetch != auto ; then
- as_fn_error $? "no suitable API for --with-fetch=$ol_with_fetch" "$LINENO" 5
+ as_fn_error "no suitable API for --with-fetch=$ol_with_fetch" "$LINENO" 5
fi
fi
@@ -22268,14 +22551,14 @@ if test $ol_enable_crypt != no ; then
LIBS="$TLS_LIBS $LIBS"
ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
-if test "x$ac_cv_func_crypt" = xyes; then :
+if test "x$ac_cv_func_crypt" = x""yes; then :
have_crypt=yes
else
LIBS="$save_LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
$as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if ${ac_cv_lib_crypt_crypt+:} false; then :
+if test "${ac_cv_lib_crypt_crypt+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -22309,7 +22592,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
+if test "x$ac_cv_lib_crypt_crypt" = x""yes; then :
LUTIL_LIBS="$LUTIL_LIBS -lcrypt"
have_crypt=yes
else
@@ -22319,17 +22602,66 @@ fi
fi
+ LIBS="$TLS_LIBS $LIBS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt_r in -lcrypt" >&5
+$as_echo_n "checking for crypt_r in -lcrypt... " >&6; }
+if test "${ac_cv_lib_crypt_crypt_r+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypt $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char crypt_r ();
+int
+main ()
+{
+return crypt_r ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_crypt_crypt_r=yes
+else
+ ac_cv_lib_crypt_crypt_r=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt_r" >&5
+$as_echo "$ac_cv_lib_crypt_crypt_r" >&6; }
+if test "x$ac_cv_lib_crypt_crypt_r" = x""yes; then :
+ have_crypt_r=yes
+else
+ have_crypt_r=no
+fi
+
+
LIBS="$save_LIBS"
if test $have_crypt = yes ; then
$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
+ if test $have_crypt_r = yes ; then
+
+$as_echo "#define HAVE_CRYPT_R 1" >>confdefs.h
+
+ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find crypt" >&5
$as_echo "$as_me: WARNING: could not find crypt" >&2;}
if test $ol_enable_crypt = yes ; then
- as_fn_error $? "could not find crypt, select appropriate options or disable" "$LINENO" 5
+ as_fn_error "could not find crypt, select appropriate options or disable" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: disabling crypt support" >&5
@@ -22340,13 +22672,13 @@ fi
if test $ol_enable_proctitle != no ; then
ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
-if test "x$ac_cv_func_setproctitle" = xyes; then :
+if test "x$ac_cv_func_setproctitle" = x""yes; then :
have_setproctitle=yes
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setproctitle in -lutil" >&5
$as_echo_n "checking for setproctitle in -lutil... " >&6; }
-if ${ac_cv_lib_util_setproctitle+:} false; then :
+if test "${ac_cv_lib_util_setproctitle+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -22380,7 +22712,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_setproctitle" >&5
$as_echo "$ac_cv_lib_util_setproctitle" >&6; }
-if test "x$ac_cv_lib_util_setproctitle" = xyes; then :
+if test "x$ac_cv_lib_util_setproctitle" = x""yes; then :
have_setproctitle=yes
LUTIL_LIBS="$LUTIL_LIBS -lutil"
else
@@ -22409,7 +22741,8 @@ if test $ol_enable_slp != no ; then
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -22422,7 +22755,7 @@ done
if test $ac_cv_header_slp_h = yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SLPOpen in -lslp" >&5
$as_echo_n "checking for SLPOpen in -lslp... " >&6; }
-if ${ac_cv_lib_slp_SLPOpen+:} false; then :
+if test "${ac_cv_lib_slp_SLPOpen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -22456,7 +22789,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_slp_SLPOpen" >&5
$as_echo "$ac_cv_lib_slp_SLPOpen" >&6; }
-if test "x$ac_cv_lib_slp_SLPOpen" = xyes; then :
+if test "x$ac_cv_lib_slp_SLPOpen" = x""yes; then :
have_slp=yes
else
have_slp=no
@@ -22470,13 +22803,13 @@ $as_echo "#define HAVE_SLP 1" >>confdefs.h
fi
elif test $ol_enable_slp = yes ; then
- as_fn_error $? "SLP not found" "$LINENO" 5
+ as_fn_error "SLP not found" "$LINENO" 5
fi
fi
ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = xyes; then :
+if test "x$ac_cv_type_mode_t" = x""yes; then :
else
@@ -22487,7 +22820,7 @@ _ACEOF
fi
ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = xyes; then :
+if test "x$ac_cv_type_off_t" = x""yes; then :
else
@@ -22498,7 +22831,7 @@ _ACEOF
fi
ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
+if test "x$ac_cv_type_pid_t" = x""yes; then :
else
@@ -22509,7 +22842,7 @@ _ACEOF
fi
ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = xyes; then :
+if test "x$ac_cv_type_ssize_t" = x""yes; then :
else
@@ -22520,7 +22853,7 @@ _ACEOF
fi
ac_fn_c_check_type "$LINENO" "caddr_t" "ac_cv_type_caddr_t" "$ac_includes_default"
-if test "x$ac_cv_type_caddr_t" = xyes; then :
+if test "x$ac_cv_type_caddr_t" = x""yes; then :
else
@@ -22531,7 +22864,7 @@ _ACEOF
fi
ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = x""yes; then :
else
@@ -22543,7 +22876,7 @@ fi
ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default"
-if test "x$ac_cv_type_long_long" = xyes; then :
+if test "x$ac_cv_type_long_long" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LONG_LONG 1
@@ -22553,7 +22886,7 @@ _ACEOF
fi
ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
+if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PTRDIFF_T 1
@@ -22569,14 +22902,14 @@ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_de
#include
#endif
"
-if test "x$ac_cv_type_socklen_t" = xyes; then :
+if test "x$ac_cv_type_socklen_t" = x""yes; then :
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the type of arg 3 to accept()" >&5
$as_echo_n "checking the type of arg 3 to accept()... " >&6; }
-if ${ol_cv_type_ber_socklen_t+:} false; then :
+if test "${ol_cv_type_ber_socklen_t+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -22628,7 +22961,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
$as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
+if test "${ac_cv_type_signal+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22664,7 +22997,7 @@ ac_fn_c_check_type "$LINENO" "sig_atomic_t" "ac_cv_type_sig_atomic_t" "$ac_inclu
#include
"
-if test "x$ac_cv_type_sig_atomic_t" = xyes; then :
+if test "x$ac_cv_type_sig_atomic_t" = x""yes; then :
else
@@ -22677,7 +23010,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if ${ac_cv_type_uid_t+:} false; then :
+if test "${ac_cv_type_uid_t+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22708,7 +23041,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
+if test "${ac_cv_header_time+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22743,7 +23076,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
+if test "${ac_cv_struct_tm+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22777,7 +23110,7 @@ $as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
fi
ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_blksize" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
@@ -22789,7 +23122,7 @@ fi
ac_fn_c_check_member "$LINENO" "struct passwd" "pw_gecos" "ac_cv_member_struct_passwd_pw_gecos" "$ac_includes_default
#include
"
-if test "x$ac_cv_member_struct_passwd_pw_gecos" = xyes; then :
+if test "x$ac_cv_member_struct_passwd_pw_gecos" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_PASSWD_PW_GECOS 1
@@ -22801,7 +23134,7 @@ fi
ac_fn_c_check_member "$LINENO" "struct passwd" "pw_passwd" "ac_cv_member_struct_passwd_pw_passwd" "$ac_includes_default
#include
"
-if test "x$ac_cv_member_struct_passwd_pw_passwd" = xyes; then :
+if test "x$ac_cv_member_struct_passwd_pw_passwd" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_PASSWD_PW_PASSWD 1
@@ -22813,7 +23146,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if toupper() requires islower()" >&5
$as_echo_n "checking if toupper() requires islower()... " >&6; }
-if ${ol_cv_c_upper_lower+:} false; then :
+if test "${ol_cv_c_upper_lower+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -22852,7 +23185,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
+if test "${ac_cv_c_const+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22932,7 +23265,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler understands volatile" >&5
$as_echo_n "checking if compiler understands volatile... " >&6; }
-if ${ol_cv_c_volatile+:} false; then :
+if test "${ol_cv_c_volatile+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22975,7 +23308,7 @@ $as_echo "#define CROSS_COMPILING 1" >>confdefs.h
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
+if test "${ac_cv_c_bigendian+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_c_bigendian=unknown
@@ -23193,7 +23526,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
;; #(
*)
- as_fn_error $? "unknown endianness
+ as_fn_error "unknown endianness
presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
@@ -23205,7 +23538,7 @@ fi
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
$as_echo_n "checking size of short... " >&6; }
-if ${ac_cv_sizeof_short+:} false; then :
+if test "${ac_cv_sizeof_short+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then :
@@ -23214,8 +23547,9 @@ else
if test "$ac_cv_type_short" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (short)
-See \`config.log' for more details" "$LINENO" 5; }
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (short)
+See \`config.log' for more details." "$LINENO" 5; }; }
else
ac_cv_sizeof_short=0
fi
@@ -23238,7 +23572,7 @@ _ACEOF
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
$as_echo_n "checking size of int... " >&6; }
-if ${ac_cv_sizeof_int+:} false; then :
+if test "${ac_cv_sizeof_int+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
@@ -23247,8 +23581,9 @@ else
if test "$ac_cv_type_int" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int)
-See \`config.log' for more details" "$LINENO" 5; }
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (int)
+See \`config.log' for more details." "$LINENO" 5; }; }
else
ac_cv_sizeof_int=0
fi
@@ -23271,7 +23606,7 @@ _ACEOF
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
+if test "${ac_cv_sizeof_long+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
@@ -23280,8 +23615,9 @@ else
if test "$ac_cv_type_long" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5; }
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long)
+See \`config.log' for more details." "$LINENO" 5; }; }
else
ac_cv_sizeof_long=0
fi
@@ -23304,7 +23640,7 @@ _ACEOF
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
$as_echo_n "checking size of long long... " >&6; }
-if ${ac_cv_sizeof_long_long+:} false; then :
+if test "${ac_cv_sizeof_long_long+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
@@ -23313,8 +23649,9 @@ else
if test "$ac_cv_type_long_long" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long long)
-See \`config.log' for more details" "$LINENO" 5; }
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long long)
+See \`config.log' for more details." "$LINENO" 5; }; }
else
ac_cv_sizeof_long_long=0
fi
@@ -23337,7 +23674,7 @@ _ACEOF
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5
$as_echo_n "checking size of wchar_t... " >&6; }
-if ${ac_cv_sizeof_wchar_t+:} false; then :
+if test "${ac_cv_sizeof_wchar_t+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t" "$ac_includes_default"; then :
@@ -23346,8 +23683,9 @@ else
if test "$ac_cv_type_wchar_t" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (wchar_t)
-See \`config.log' for more details" "$LINENO" 5; }
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (wchar_t)
+See \`config.log' for more details." "$LINENO" 5; }; }
else
ac_cv_sizeof_wchar_t=0
fi
@@ -23395,7 +23733,7 @@ if test $ol_with_mp = longlong || test $ol_with_mp = auto ; then
$as_echo "#define USE_MP_LONG_LONG 1" >>confdefs.h
elif test $ol_with_mp = longlong ; then
- as_fn_error $? "long long unusable for multiple precision" "$LINENO" 5
+ as_fn_error "long long unusable for multiple precision" "$LINENO" 5
fi
fi
if test $ol_with_mp = long || test $ol_with_mp = auto ; then
@@ -23405,14 +23743,14 @@ if test $ol_with_mp = long || test $ol_with_mp = auto ; then
$as_echo "#define USE_MP_LONG 1" >>confdefs.h
elif test $ol_with_mp = long ; then
- as_fn_error $? "long unusable for multiple precision" "$LINENO" 5
+ as_fn_error "long unusable for multiple precision" "$LINENO" 5
fi
fi
if test $ol_with_mp = bignum || test $ol_with_mp = auto ; then
for ac_header in openssl/bn.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "openssl/bn.h" "ac_cv_header_openssl_bn_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_bn_h" = xyes; then :
+if test "x$ac_cv_header_openssl_bn_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENSSL_BN_H 1
_ACEOF
@@ -23424,7 +23762,7 @@ done
for ac_header in openssl/crypto.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_crypto_h" = xyes; then :
+if test "x$ac_cv_header_openssl_crypto_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENSSL_CRYPTO_H 1
_ACEOF
@@ -23441,14 +23779,14 @@ done
$as_echo "#define USE_MP_BIGNUM 1" >>confdefs.h
elif test $ol_with_mp = bignum ; then
- as_fn_error $? "bignum not available" "$LINENO" 5
+ as_fn_error "bignum not available" "$LINENO" 5
fi
fi
if test $ol_with_mp = gmp || test $ol_with_mp = auto ; then
for ac_header in gmp.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "gmp.h" "ac_cv_header_gmp_h" "$ac_includes_default"
-if test "x$ac_cv_header_gmp_h" = xyes; then :
+if test "x$ac_cv_header_gmp_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GMP_H 1
_ACEOF
@@ -23459,7 +23797,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_add_ui in -lgmp" >&5
$as_echo_n "checking for __gmpz_add_ui in -lgmp... " >&6; }
-if ${ac_cv_lib_gmp___gmpz_add_ui+:} false; then :
+if test "${ac_cv_lib_gmp___gmpz_add_ui+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -23493,7 +23831,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_add_ui" >&5
$as_echo "$ac_cv_lib_gmp___gmpz_add_ui" >&6; }
-if test "x$ac_cv_lib_gmp___gmpz_add_ui" = xyes; then :
+if test "x$ac_cv_lib_gmp___gmpz_add_ui" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGMP 1
_ACEOF
@@ -23508,7 +23846,7 @@ $as_echo "#define USE_MP_GMP 1" >>confdefs.h
ol_with_mp=gmp
elif test $ol_with_mp = gmp ; then
- as_fn_error $? "gmp not available" "$LINENO" 5
+ as_fn_error "gmp not available" "$LINENO" 5
fi
fi
if test $ol_with_mp = auto ; then
@@ -23517,7 +23855,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
$as_echo_n "checking for working memcmp... " >&6; }
-if ${ac_cv_func_memcmp_working+:} false; then :
+if test "${ac_cv_func_memcmp_working+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -23587,7 +23925,7 @@ fi
for ac_func in strftime
do :
ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
-if test "x$ac_cv_func_strftime" = xyes; then :
+if test "x$ac_cv_func_strftime" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRFTIME 1
_ACEOF
@@ -23596,7 +23934,7 @@ else
# strftime is in -lintl on SCO UNIX.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
$as_echo_n "checking for strftime in -lintl... " >&6; }
-if ${ac_cv_lib_intl_strftime+:} false; then :
+if test "${ac_cv_lib_intl_strftime+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -23630,7 +23968,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
$as_echo "$ac_cv_lib_intl_strftime" >&6; }
-if test "x$ac_cv_lib_intl_strftime" = xyes; then :
+if test "x$ac_cv_lib_intl_strftime" = x""yes; then :
$as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
LIBS="-lintl $LIBS"
@@ -23642,7 +23980,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton()" >&5
$as_echo_n "checking for inet_aton()... " >&6; }
-if ${ol_cv_func_inet_aton+:} false; then :
+if test "${ol_cv_func_inet_aton+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -23689,7 +24027,7 @@ $as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
ac_fn_c_check_func "$LINENO" "_spawnlp" "ac_cv_func__spawnlp"
-if test "x$ac_cv_func__spawnlp" = xyes; then :
+if test "x$ac_cv_func__spawnlp" = x""yes; then :
$as_echo "#define HAVE_SPAWNLP 1" >>confdefs.h
@@ -23697,7 +24035,7 @@ fi
ac_fn_c_check_func "$LINENO" "_snprintf" "ac_cv_func__snprintf"
-if test "x$ac_cv_func__snprintf" = xyes; then :
+if test "x$ac_cv_func__snprintf" = x""yes; then :
ac_cv_func_snprintf=yes
$as_echo "#define snprintf _snprintf" >>confdefs.h
@@ -23710,7 +24048,8 @@ for ac_func in vsnprintf _vsnprintf
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -23729,13 +24068,13 @@ fi
for ac_func in vprintf
do :
ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
-if test "x$ac_cv_func_vprintf" = xyes; then :
+if test "x$ac_cv_func_vprintf" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_VPRINTF 1
_ACEOF
ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
-if test "x$ac_cv_func__doprnt" = xyes; then :
+if test "x$ac_cv_func__doprnt" = x""yes; then :
$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
@@ -23751,7 +24090,8 @@ if test $ac_cv_func_vprintf = yes ; then
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -23822,7 +24162,8 @@ for ac_func in \
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -23831,31 +24172,25 @@ fi
done
-ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt"
-if test "x$ac_cv_func_getopt" = xyes; then :
- $as_echo "#define HAVE_GETOPT 1" >>confdefs.h
-
-else
- case " $LIBOBJS " in
- *" getopt.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS getopt.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "getpeereid" "ac_cv_func_getpeereid"
-if test "x$ac_cv_func_getpeereid" = xyes; then :
- $as_echo "#define HAVE_GETPEEREID 1" >>confdefs.h
+for ac_func in getopt getpeereid
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
else
case " $LIBOBJS " in
- *" getpeereid.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS getpeereid.$ac_objext"
+ *" $ac_func.$ac_objext "* ) ;;
+ *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
;;
esac
fi
+done
@@ -23868,7 +24203,8 @@ if test "$ac_cv_func_getpeereid" != yes; then
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -23882,7 +24218,7 @@ done
#include
#endif
"
-if test "x$ac_cv_member_struct_msghdr_msg_accrightslen" = xyes; then :
+if test "x$ac_cv_member_struct_msghdr_msg_accrightslen" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTSLEN 1
@@ -23897,7 +24233,7 @@ fi
#include
#endif
"
-if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes; then :
+if test "x$ac_cv_member_struct_msghdr_msg_control" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
@@ -23908,7 +24244,7 @@ fi
fi
ac_fn_c_check_member "$LINENO" "struct stat" "st_fstype" "ac_cv_member_struct_stat_st_fstype" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_fstype" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_fstype" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_STAT_ST_FSTYPE 1
@@ -23917,7 +24253,7 @@ _ACEOF
fi
ac_fn_c_check_member "$LINENO" "struct stat" "st_vfstype" "ac_cv_member_struct_stat_st_vfstype" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_vfstype" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_vfstype" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_STAT_ST_VFSTYPE 1
@@ -23965,7 +24301,7 @@ if test "$ol_enable_slapi" != no ; then
for ac_header in ltdl.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
-if test "x$ac_cv_header_ltdl_h" = xyes; then :
+if test "x$ac_cv_header_ltdl_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LTDL_H 1
_ACEOF
@@ -23976,11 +24312,11 @@ done
if test $ac_cv_header_ltdl_h != yes ; then
- as_fn_error $? "could not locate " "$LINENO" 5
+ as_fn_error "could not locate " "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlinit in -lltdl" >&5
$as_echo_n "checking for lt_dlinit in -lltdl... " >&6; }
-if ${ac_cv_lib_ltdl_lt_dlinit+:} false; then :
+if test "${ac_cv_lib_ltdl_lt_dlinit+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -24014,7 +24350,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ltdl_lt_dlinit" >&5
$as_echo "$ac_cv_lib_ltdl_lt_dlinit" >&6; }
-if test "x$ac_cv_lib_ltdl_lt_dlinit" = xyes; then :
+if test "x$ac_cv_lib_ltdl_lt_dlinit" = x""yes; then :
SLAPI_LIBS=-lltdl
LIBSLAPI=slapi/libslapi.la
@@ -24023,7 +24359,7 @@ $as_echo "#define HAVE_LIBLTDL 1" >>confdefs.h
else
- as_fn_error $? "could not locate libtool -lltdl" "$LINENO" 5
+ as_fn_error "could not locate libtool -lltdl" "$LINENO" 5
fi
@@ -24095,7 +24431,7 @@ $as_echo "$as_me: WARNING: ACIs need dynacl" >&2;}
fi
if test "$ol_enable_aci" = mod ; then
MFLAG=SLAPD_MOD_DYNAMIC
- as_fn_error $? "ACI build as dynamic module not supported (yet)" "$LINENO" 5
+ as_fn_error "ACI build as dynamic module not supported (yet)" "$LINENO" 5
else
MFLAG=SLAPD_MOD_STATIC
fi
@@ -24146,10 +24482,10 @@ _ACEOF
fi
-if test "$ol_enable_deprecated_bdb" != no ; then
+if test "$ol_enable_bdb" != no ; then
BUILD_SLAPD=yes
- BUILD_BDB=$ol_enable_deprecated_bdb
- if test "$ol_enable_deprecated_bdb" = mod ; then
+ BUILD_BDB=$ol_enable_bdb
+ if test "$ol_enable_bdb" = mod ; then
SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-bdb"
MFLAG=SLAPD_MOD_DYNAMIC
else
@@ -24180,10 +24516,10 @@ _ACEOF
fi
-if test "$ol_enable_deprecated_hdb" != no ; then
+if test "$ol_enable_hdb" != no ; then
BUILD_SLAPD=yes
- BUILD_HDB=$ol_enable_deprecated_hdb
- if test "$ol_enable_deprecated_hdb" = mod ; then
+ BUILD_HDB=$ol_enable_hdb
+ if test "$ol_enable_hdb" = mod ; then
SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-hdb"
MFLAG=SLAPD_MOD_DYNAMIC
else
@@ -24249,6 +24585,24 @@ _ACEOF
fi
+if test "$ol_enable_asyncmeta" != no ; then
+ BUILD_SLAPD=yes
+ BUILD_ASYNCMETA=$ol_enable_asyncmeta
+ BUILD_REWRITE=yes
+ if test "$ol_enable_asyncmeta" = mod ; then
+ SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-asyncmeta"
+ MFLAG=SLAPD_MOD_DYNAMIC
+ else
+ SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-asyncmeta"
+ MFLAG=SLAPD_MOD_STATIC
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define SLAPD_ASYNCMETA $MFLAG
+_ACEOF
+
+fi
+
if test "$ol_enable_ndb" != no ; then
BUILD_SLAPD=yes
BUILD_NDB=$ol_enable_ndb
@@ -24389,6 +24743,23 @@ _ACEOF
fi
+if test "$ol_link_wt" != no ; then
+ BUILD_SLAPD=yes
+ BUILD_WT=$ol_enable_wt
+ if test "$ol_enable_wt" = mod; then
+ SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-wt"
+ MFLAG=SLAPD_MOD_DYNAMIC
+ else
+ SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-wt"
+ MFLAG=SLAPD_MOD_STATIC
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define SLAPD_WT $MFLAG
+_ACEOF
+
+fi
+
if test "$ol_enable_accesslog" != no ; then
BUILD_ACCESSLOG=$ol_enable_accesslog
if test "$ol_enable_accesslog" = mod ; then
@@ -24421,6 +24792,22 @@ _ACEOF
fi
+if test "$ol_enable_autoca" != no ; then
+ BUILD_AUTOCA=$ol_enable_autoca
+ if test "$ol_enable_autoca" = mod ; then
+ MFLAG=SLAPD_MOD_DYNAMIC
+ SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS autoca.la"
+ else
+ MFLAG=SLAPD_MOD_STATIC
+ SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS autoca.o"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define SLAPD_OVER_AUTOCA $MFLAG
+_ACEOF
+
+fi
+
if test "$ol_enable_collect" != no ; then
BUILD_COLLECT=$ol_enable_collect
if test "$ol_enable_collect" = mod ; then
@@ -24817,6 +25204,12 @@ fi
+
+
+
+
+
+
@@ -24831,7 +25224,7 @@ fi
-ac_config_files="$ac_config_files Makefile:build/top.mk:Makefile.in:build/dir.mk doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk doc/man/Makefile:build/top.mk:doc/man/Makefile.in:build/dir.mk doc/man/man1/Makefile:build/top.mk:doc/man/man1/Makefile.in:build/man.mk doc/man/man3/Makefile:build/top.mk:doc/man/man3/Makefile.in:build/man.mk doc/man/man5/Makefile:build/top.mk:doc/man/man5/Makefile.in:build/man.mk doc/man/man8/Makefile:build/top.mk:doc/man/man8/Makefile.in:build/man.mk clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk include/Makefile:build/top.mk:include/Makefile.in libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk libraries/liblunicode/Makefile:build/top.mk:libraries/liblunicode/Makefile.in:build/lib.mk:build/lib-static.mk libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk servers/slapd/back-bdb/Makefile:build/top.mk:servers/slapd/back-bdb/Makefile.in:build/mod.mk servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk servers/slapd/back-hdb/Makefile:build/top.mk:servers/slapd/back-hdb/Makefile.in:build/mod.mk servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk servers/slapd/back-mdb/Makefile:build/top.mk:servers/slapd/back-mdb/Makefile.in:build/mod.mk servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk servers/slapd/back-ndb/Makefile:build/top.mk:servers/slapd/back-ndb/Makefile.in:build/mod.mk servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/Makefile.in:build/mod.mk servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk servers/slapd/back-relay/Makefile:build/top.mk:servers/slapd/back-relay/Makefile.in:build/mod.mk servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/mod.mk servers/slapd/back-sock/Makefile:build/top.mk:servers/slapd/back-sock/Makefile.in:build/mod.mk servers/slapd/back-sql/Makefile:build/top.mk:servers/slapd/back-sql/Makefile.in:build/mod.mk servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk servers/slapd/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.mk servers/slapd/overlays/Makefile:build/top.mk:servers/slapd/overlays/Makefile.in:build/lib.mk tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk tests/run tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk"
+ac_config_files="$ac_config_files Makefile:build/top.mk:Makefile.in:build/dir.mk doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk doc/man/Makefile:build/top.mk:doc/man/Makefile.in:build/dir.mk doc/man/man1/Makefile:build/top.mk:doc/man/man1/Makefile.in:build/man.mk doc/man/man3/Makefile:build/top.mk:doc/man/man3/Makefile.in:build/man.mk doc/man/man5/Makefile:build/top.mk:doc/man/man5/Makefile.in:build/man.mk doc/man/man8/Makefile:build/top.mk:doc/man/man8/Makefile.in:build/man.mk clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk include/Makefile:build/top.mk:include/Makefile.in libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk libraries/liblunicode/Makefile:build/top.mk:libraries/liblunicode/Makefile.in:build/lib.mk:build/lib-static.mk libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk servers/slapd/back-bdb/Makefile:build/top.mk:servers/slapd/back-bdb/Makefile.in:build/mod.mk servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk servers/slapd/back-hdb/Makefile:build/top.mk:servers/slapd/back-hdb/Makefile.in:build/mod.mk servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk servers/slapd/back-mdb/Makefile:build/top.mk:servers/slapd/back-mdb/Makefile.in:build/mod.mk servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk servers/slapd/back-asyncmeta/Makefile:build/top.mk:servers/slapd/back-asyncmeta/Makefile.in:build/mod.mk servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk servers/slapd/back-ndb/Makefile:build/top.mk:servers/slapd/back-ndb/Makefile.in:build/mod.mk servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/Makefile.in:build/mod.mk servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk servers/slapd/back-relay/Makefile:build/top.mk:servers/slapd/back-relay/Makefile.in:build/mod.mk servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/mod.mk servers/slapd/back-sock/Makefile:build/top.mk:servers/slapd/back-sock/Makefile.in:build/mod.mk servers/slapd/back-sql/Makefile:build/top.mk:servers/slapd/back-sql/Makefile.in:build/mod.mk servers/slapd/back-wt/Makefile:build/top.mk:servers/slapd/back-wt/Makefile.in:build/mod.mk servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk servers/slapd/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.mk servers/slapd/overlays/Makefile:build/top.mk:servers/slapd/overlays/Makefile.in:build/lib.mk tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk tests/run tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk"
ac_config_commands="$ac_config_commands default"
@@ -24846,7 +25239,6 @@ DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
-U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -24862,20 +25254,20 @@ LTLIBOBJS=$ac_ltlibobjs
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error $? "conditional \"AMDEP\" was never defined.
+ as_fn_error "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -24976,7 +25368,6 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -25022,19 +25413,19 @@ export LANGUAGE
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -25230,7 +25621,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -25284,7 +25675,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -25350,10 +25741,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -25370,16 +25761,11 @@ ac_need_defaults=:
while test $# != 0
do
case $1 in
- --*=?*)
+ --*=*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- --*=)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=
- ac_shift=:
- ;;
*)
ac_option=$1
ac_optarg=$2
@@ -25401,7 +25787,6 @@ do
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -25414,7 +25799,7 @@ do
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
+ as_fn_error "ambiguous option: \`$1'
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -25423,7 +25808,7 @@ Try \`$0 --help' for more information.";;
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
+ -*) as_fn_error "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -25511,6 +25896,7 @@ do
"servers/slapd/back-ldif/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk" ;;
"servers/slapd/back-mdb/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/back-mdb/Makefile:build/top.mk:servers/slapd/back-mdb/Makefile.in:build/mod.mk" ;;
"servers/slapd/back-meta/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk" ;;
+ "servers/slapd/back-asyncmeta/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/back-asyncmeta/Makefile:build/top.mk:servers/slapd/back-asyncmeta/Makefile.in:build/mod.mk" ;;
"servers/slapd/back-monitor/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk" ;;
"servers/slapd/back-ndb/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/back-ndb/Makefile:build/top.mk:servers/slapd/back-ndb/Makefile.in:build/mod.mk" ;;
"servers/slapd/back-null/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/Makefile.in:build/mod.mk" ;;
@@ -25520,6 +25906,7 @@ do
"servers/slapd/back-shell/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/mod.mk" ;;
"servers/slapd/back-sock/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/back-sock/Makefile:build/top.mk:servers/slapd/back-sock/Makefile.in:build/mod.mk" ;;
"servers/slapd/back-sql/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/back-sql/Makefile:build/top.mk:servers/slapd/back-sql/Makefile.in:build/mod.mk" ;;
+ "servers/slapd/back-wt/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/back-wt/Makefile:build/top.mk:servers/slapd/back-wt/Makefile.in:build/mod.mk" ;;
"servers/slapd/shell-backends/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk" ;;
"servers/slapd/slapi/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.mk" ;;
"servers/slapd/overlays/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/overlays/Makefile:build/top.mk:servers/slapd/overlays/Makefile.in:build/lib.mk" ;;
@@ -25528,7 +25915,7 @@ do
"tests/progs/Makefile") CONFIG_FILES="$CONFIG_FILES tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk" ;;
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -25551,10 +25938,9 @@ fi
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp= ac_tmp=
+ tmp=
trap 'exit_status=$?
- : "${ac_tmp:=$tmp}"
- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
@@ -25562,13 +25948,12 @@ $debug ||
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -d "$tmp"
+ test -n "$tmp" && test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -25585,12 +25970,12 @@ if test "x$ac_cr" = x; then
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF
@@ -25599,18 +25984,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -25618,7 +26003,7 @@ done
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
@@ -25666,7 +26051,7 @@ t delim
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = ""
@@ -25698,29 +26083,21 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
-h
-s///
-s/^/:/
-s/[ ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
s/:*$//
-x
-s/\(=[ ]*\).*/\1/
-G
-s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -25732,7 +26109,7 @@ fi # test -n "$CONFIG_FILES"
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
@@ -25744,11 +26121,11 @@ _ACEOF
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_tt"; then
+ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_t"; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -25833,7 +26210,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -25846,7 +26223,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -25865,7 +26242,7 @@ do
for ac_f
do
case $ac_f in
- -) ac_f="$ac_tmp/stdin";;
+ -) ac_f="$tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
@@ -25874,7 +26251,7 @@ do
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -25900,8 +26277,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
esac
case $ac_tag in
- *:-:* | *:-) cat >"$ac_tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -26031,24 +26408,23 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
- "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&5
+which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&2;}
+which seems to be undefined. Please make sure it is defined." >&2;}
- rm -f "$ac_tmp/stdin"
+ rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -26057,21 +26433,21 @@ which seems to be undefined. Please make sure it is defined" >&2;}
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
- } >"$ac_tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
- mv "$ac_tmp/config.h" "$ac_file" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ mv "$tmp/config.h" "$ac_file" \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error $? "could not create -" "$LINENO" 5
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ || as_fn_error "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_stamp_count=1
@@ -26207,7 +26583,7 @@ rm -f $BACKENDSC
cat > $BACKENDSC << ENDX
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2013 The OpenLDAP Foundation.
+ * Copyright 1998-2017 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26258,7 +26634,7 @@ rm -f $OVERLAYSC
cat > $OVERLAYSC << ENDX
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2013 The OpenLDAP Foundation.
+ * Copyright 1998-2017 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26322,7 +26698,7 @@ _ACEOF
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -26343,7 +26719,7 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit 1
+ $ac_cs_success || as_fn_exit $?
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5