From 837b82a986f6da5975b8d83038cdb3fe620f17cd Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Thu, 19 Sep 2013 13:08:57 -0700 Subject: [PATCH] Updated configure --- configure | 1541 +++++++++++++++++++++++++++-------------------------- 1 file changed, 771 insertions(+), 770 deletions(-) diff --git a/configure b/configure index 81eccdf840..947aa2bbe4 100755 --- a/configure +++ b/configure @@ -1,15 +1,15 @@ #! /bin/sh -# From configure.in Id: f0f8d996f3de4fb2ff4449711e14444f62107475 . +# From configure.in Id: e6cc3854537162f935a5a8cfd0cc090ecc4b2817 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65. +# Generated by GNU Autoconf 2.68. # # Copyright 1998-2013 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 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -93,6 +93,7 @@ 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 @@ -218,11 +219,18 @@ 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 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + 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+"$@"} fi if test x$as_have_required = xno; then : @@ -321,7 +329,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 @@ -361,19 +369,19 @@ else fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS 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=$?; 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 + 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 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -685,7 +693,7 @@ test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -971,9 +979,9 @@ enable_slp enable_wrappers enable_xxslapbackends enable_backends -enable_bdb +enable_deprecated_bdb enable_dnssrv -enable_hdb +enable_deprecated_hdb enable_ldap enable_mdb enable_meta @@ -1090,8 +1098,9 @@ do fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -1136,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 @@ -1162,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 @@ -1366,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 @@ -1382,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 @@ -1412,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" ;; *=*) @@ -1421,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 ;; @@ -1431,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 @@ -1439,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 @@ -1468,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' @@ -1482,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 @@ -1498,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. @@ -1539,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 @@ -1583,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 @@ -1670,9 +1679,9 @@ SLAPD (Standalone LDAP Daemon) Options: SLAPD Backend Options: --enable-backends enable all available backends no|yes|mod - --enable-bdb enable Berkeley DB backend no|yes|mod [no] + --enable-deprecated-bdb enable deprecated Berkeley DB backend. Will be removed in OpenLDAP 2.6 no|yes|mod [no] --enable-dnssrv enable dnssrv backend no|yes|mod [no] - --enable-hdb enable Hierarchical DB backend no|yes|mod [yes] + --enable-deprecated-hdb enable deprecated Hierarchical DB backend. Will be removed in OpenLDAP 2.6 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] @@ -1813,9 +1822,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.65 +generated by GNU Autoconf 2.68 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -1862,7 +1871,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1908,7 +1917,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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1934,7 +1943,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; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1945,7 +1954,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1958,10 +1967,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1997,7 +2006,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -2020,17 +2029,15 @@ $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;} -( cat <<\_ASBOX -## --------------------------------------------- ## +( $as_echo "## --------------------------------------------- ## ## 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -2039,7 +2046,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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -2080,7 +2087,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -2094,7 +2101,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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2112,7 +2119,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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -2124,7 +2131,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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2179,7 +2186,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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -2192,7 +2199,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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -2233,7 +2240,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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -2246,7 +2253,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 { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$4+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2290,7 +2297,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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_member @@ -2467,7 +2474,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ rm -f conftest.val fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_compute_int @@ -2476,7 +2483,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.65. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2586,11 +2593,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2624,11 +2629,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2641,11 +2644,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2659,11 +2660,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2718,7 +2717,12 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # 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 elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2733,7 +2737,11 @@ 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" + . "$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; } fi done @@ -2793,7 +2801,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. ## @@ -2834,16 +2842,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_aux_dir= for ac_dir in build "$srcdir"/build; do - 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 + 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 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, @@ -2857,13 +2871,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" @@ -2885,27 +2899,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 test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; 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='-' @@ -2923,14 +2937,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 test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; 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 @@ -2938,7 +2952,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='-' @@ -2956,14 +2970,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 test "${ac_cv_target+set}" = set; then : +if ${ac_cv_target+:} false; 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 @@ -2971,7 +2985,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='-' @@ -3012,7 +3026,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 test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3112,7 +3126,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 @@ -3122,7 +3136,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 @@ -3189,7 +3203,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 test "${ac_cv_prog_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -3229,7 +3243,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 { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -3237,7 +3251,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;; @@ -3268,7 +3282,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 @@ -3314,7 +3328,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 test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -3354,7 +3368,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 test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -3503,7 +3517,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" @@ -3524,7 +3538,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" @@ -3545,7 +3559,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" @@ -3566,7 +3580,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" @@ -3588,7 +3602,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" @@ -3609,7 +3623,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" @@ -3631,7 +3645,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" @@ -3652,7 +3666,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" @@ -3673,7 +3687,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" @@ -3694,7 +3708,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" @@ -3715,7 +3729,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" @@ -3736,7 +3750,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" @@ -3757,7 +3771,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" @@ -3785,7 +3799,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" @@ -3806,7 +3820,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" @@ -3827,7 +3841,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" @@ -3848,7 +3862,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" @@ -3869,7 +3883,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" @@ -3890,7 +3904,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" @@ -3911,7 +3925,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" @@ -3932,7 +3946,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" @@ -3953,7 +3967,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" @@ -3974,7 +3988,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" @@ -3995,7 +4009,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" @@ -4016,7 +4030,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" @@ -4037,7 +4051,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" @@ -4081,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-bdb +# OpenLDAP --enable-deprecated-bdb - # Check whether --enable-bdb was given. -if test "${enable_bdb+set}" = set; then : - enableval=$enable_bdb; + # Check whether --enable-deprecated-bdb was given. +if test "${enable_deprecated_bdb+set}" = set; then : + enableval=$enable_deprecated_bdb; ol_arg=invalid for ol_val in no yes mod ; do if test "$enableval" = "$ol_val" ; then @@ -4100,15 +4114,15 @@ if test "${enable_bdb+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then - as_fn_error "bad value $enableval for --enable-bdb" "$LINENO" 5 + as_fn_error $? "bad value $enableval for --enable-deprecated-bdb" "$LINENO" 5 fi - ol_enable_bdb="$ol_arg" + ol_enable_deprecated-bdb="$ol_arg" else - ol_enable_bdb=${ol_enable_backends:-no} + ol_enable_deprecated-bdb=${ol_enable_backends:-no} fi -# end --enable-bdb +# end --enable-deprecated-bdb # OpenLDAP --enable-dnssrv # Check whether --enable-dnssrv was given. @@ -4121,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" @@ -4130,11 +4144,11 @@ else fi # end --enable-dnssrv -# OpenLDAP --enable-hdb +# OpenLDAP --enable-deprecated-hdb - # Check whether --enable-hdb was given. -if test "${enable_hdb+set}" = set; then : - enableval=$enable_hdb; + # Check whether --enable-deprecated-hdb was given. +if test "${enable_deprecated_hdb+set}" = set; then : + enableval=$enable_deprecated_hdb; ol_arg=invalid for ol_val in no yes mod ; do if test "$enableval" = "$ol_val" ; then @@ -4142,15 +4156,15 @@ if test "${enable_hdb+set}" = set; then : fi done if test "$ol_arg" = "invalid" ; then - as_fn_error "bad value $enableval for --enable-hdb" "$LINENO" 5 + as_fn_error $? "bad value $enableval for --enable-deprecated-hdb" "$LINENO" 5 fi - ol_enable_hdb="$ol_arg" + ol_enable_deprecated-hdb="$ol_arg" else - ol_enable_hdb=${ol_enable_backends:-yes} + ol_enable_deprecated-hdb=${ol_enable_backends:-no} fi -# end --enable-hdb +# end --enable-deprecated-hdb # OpenLDAP --enable-ldap # Check whether --enable-ldap was given. @@ -4163,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" @@ -4184,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" @@ -4205,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" @@ -4226,7 +4240,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" @@ -4247,7 +4261,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" @@ -4268,7 +4282,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" @@ -4289,7 +4303,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" @@ -4310,7 +4324,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" @@ -4331,7 +4345,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" @@ -4352,7 +4366,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" @@ -4373,7 +4387,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" @@ -4394,7 +4408,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" @@ -4443,7 +4457,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" @@ -4462,7 +4476,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" @@ -4484,7 +4498,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" @@ -4506,7 +4520,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" @@ -4528,7 +4542,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" @@ -4550,7 +4564,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" @@ -4572,7 +4586,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" @@ -4594,7 +4608,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" @@ -4616,7 +4630,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" @@ -4638,7 +4652,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" @@ -4660,7 +4674,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" @@ -4682,7 +4696,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" @@ -4704,7 +4718,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" @@ -4726,7 +4740,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" @@ -4748,7 +4762,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" @@ -4770,7 +4784,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" @@ -4792,7 +4806,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" @@ -4814,7 +4828,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" @@ -4836,7 +4850,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" @@ -4858,7 +4872,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" @@ -4880,7 +4894,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" @@ -5015,9 +5029,9 @@ $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_bdb = no && + test $ol_enable_deprecated_bdb = no && test $ol_enable_dnssrv = no && - test $ol_enable_hdb = no && + test $ol_enable_deprecated_hdb = no && test $ol_enable_ldap = no && test $ol_enable_mdb = no && test $ol_enable_meta = no && @@ -5032,7 +5046,7 @@ elif test $ol_enable_modules != yes && test $ol_enable_sql = 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;} @@ -5041,18 +5055,18 @@ $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_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 @@ -5169,7 +5183,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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5208,7 +5222,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;} @@ -5231,7 +5245,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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5270,7 +5284,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 @@ -5281,7 +5295,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 test "${ac_cv_prog_AR+set}" = set; then : +if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -5320,7 +5334,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 @@ -5427,7 +5441,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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5467,7 +5481,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 test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -5520,7 +5534,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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5560,7 +5574,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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5619,7 +5633,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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5663,7 +5677,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 test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -5717,8 +5731,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 @@ -5832,9 +5846,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_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "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; } @@ -5876,8 +5889,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 @@ -5934,9 +5947,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 @@ -5947,7 +5960,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 test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5987,8 +6000,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 @@ -5998,7 +6011,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 test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6035,7 +6048,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 test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -6113,7 +6126,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 test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -6212,7 +6225,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 test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -6319,7 +6332,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 test "${lt_cv_path_SED+set}" = set; then : +if ${lt_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else # Loop through the user's path and test for sed and gsed. @@ -6376,7 +6389,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 test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -6425,7 +6438,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 @@ -6439,7 +6452,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 test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -6491,7 +6504,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 @@ -6551,7 +6564,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 test "${lt_cv_path_LD+set}" = set; then : +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -6588,10 +6601,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 test "${lt_cv_prog_gnu_ld+set}" = set; then : +if ${lt_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -6611,7 +6624,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 test "${lt_cv_ld_reload_flag+set}" = set; then : +if ${lt_cv_ld_reload_flag+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' @@ -6636,7 +6649,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 test "${lt_cv_path_NM+set}" = set; then : +if ${lt_cv_path_NM+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -6693,7 +6706,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 test "${lt_cv_deplibs_check_method+set}" = set; then : +if ${lt_cv_deplibs_check_method+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -6910,7 +6923,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6913 "configure"' > conftest.$ac_ext + echo '#line 6926 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6997,7 +7010,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 test "${lt_cv_cc_needs_belf+set}" = set; then : +if ${lt_cv_cc_needs_belf+:} false; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -7044,7 +7057,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 test "${ac_cv_prog_DLLTOOL+set}" = set; then : +if ${ac_cv_prog_DLLTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DLLTOOL"; then @@ -7084,7 +7097,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 test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DLLTOOL"; then @@ -7136,7 +7149,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 test "${ac_cv_prog_AS+set}" = set; then : +if ${ac_cv_prog_AS+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AS"; then @@ -7176,7 +7189,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 test "${ac_cv_prog_ac_ct_AS+set}" = set; then : +if ${ac_cv_prog_ac_ct_AS+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AS"; then @@ -7228,7 +7241,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 test "${ac_cv_prog_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -7268,7 +7281,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 test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -7334,7 +7347,7 @@ if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -7364,7 +7377,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -7380,11 +7393,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -7423,7 +7436,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -7439,18 +7452,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i 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 @@ -7462,7 +7475,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 test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7579,8 +7592,7 @@ 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 " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -7593,7 +7605,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" = x""yes; then : +if test "x$ac_cv_header_dlfcn_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DLFCN_H 1 _ACEOF @@ -7608,7 +7620,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 test "${lt_cv_sys_max_cmd_len+set}" = set; then : +if ${lt_cv_sys_max_cmd_len+:} false; then : $as_echo_n "(cached) " >&6 else i=0 @@ -7711,7 +7723,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 test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : +if ${lt_cv_sys_global_symbol_pipe+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7914,7 +7926,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then : +if ${lt_cv_objdir+:} false; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -7981,7 +7993,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 test "${ac_cv_prog_AR+set}" = set; then : +if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -8021,7 +8033,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 test "${ac_cv_prog_ac_ct_AR+set}" = set; then : +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -8073,7 +8085,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 test "${ac_cv_prog_RANLIB+set}" = set; then : +if ${ac_cv_prog_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -8113,7 +8125,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 test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -8165,7 +8177,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 test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -8205,7 +8217,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 test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -8307,7 +8319,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 test "${lt_cv_path_MAGIC_CMD+set}" = set; then : +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -8369,7 +8381,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 test "${lt_cv_path_MAGIC_CMD+set}" = set; then : +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -8529,7 +8541,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 test "${lt_prog_compiler_static_works+set}" = set; then : +if ${lt_prog_compiler_static_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_prog_compiler_static_works=no @@ -8575,7 +8587,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 test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -8591,11 +8603,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:8594: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8606: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8598: \$? = $ac_status" >&5 + echo "$as_me:8610: \$? = $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. @@ -8837,7 +8849,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 test "${lt_prog_compiler_pic_works+set}" = set; then : +if ${lt_prog_compiler_pic_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_prog_compiler_pic_works=no @@ -8853,11 +8865,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:8856: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8868: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8860: \$? = $ac_status" >&5 + echo "$as_me:8872: \$? = $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. @@ -8896,7 +8908,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 test "${lt_cv_prog_compiler_c_o+set}" = set; then : +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -8915,11 +8927,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:8918: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8930: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8922: \$? = $ac_status" >&5 + echo "$as_me:8934: \$? = $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 @@ -10529,7 +10541,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 test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10563,7 +10575,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" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -10577,12 +10589,12 @@ fi *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = x""yes; then : +if test "x$ac_cv_func_shl_load" = xyes; 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 test "${ac_cv_lib_dld_shl_load+set}" = set; then : +if ${ac_cv_lib_dld_shl_load+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10616,16 +10628,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" = x""yes; then : +if test "x$ac_cv_lib_dld_shl_load" = xyes; 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" = x""yes; then : +if test "x$ac_cv_func_dlopen" = xyes; 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 test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10659,12 +10671,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" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; 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 test "${ac_cv_lib_svld_dlopen+set}" = set; then : +if ${ac_cv_lib_svld_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10698,12 +10710,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" = x""yes; then : +if test "x$ac_cv_lib_svld_dlopen" = xyes; 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 test "${ac_cv_lib_dld_dld_link+set}" = set; then : +if ${ac_cv_lib_dld_dld_link+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10737,7 +10749,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" = x""yes; then : +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi @@ -10778,7 +10790,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 test "${lt_cv_dlopen_self+set}" = set; then : +if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -10787,7 +10799,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 test "${lt_cv_dlopen_self_static+set}" = set; then : +if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -10885,7 +10897,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. @@ -12058,7 +12070,7 @@ CC="$lt_save_CC" ;; *) - as_fn_error "Unsupported tag name: $tagname" "$LINENO" 5 + as_fn_error $? "Unsupported tag name: $tagname" "$LINENO" 5 ;; esac @@ -12076,7 +12088,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 @@ -12105,7 +12117,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 test "${ac_cv_path_PERLBIN+set}" = set; then : +if ${ac_cv_path_PERLBIN+:} false; then : $as_echo_n "(cached) " >&6 else case $PERLBIN in @@ -12145,7 +12157,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 @@ -12173,7 +12185,7 @@ if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -12203,7 +12215,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -12219,11 +12231,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -12262,7 +12274,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -12278,18 +12290,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i 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 @@ -12300,7 +12312,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 test "${ol_cv_msvc+set}" = set; then : +if ${ol_cv_msvc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12316,7 +12328,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ol_cv_msvc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ol_cv_msvc" >&5 $as_echo "$ol_cv_msvc" >&6; } @@ -12337,7 +12349,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 test "${ac_cv_lib_be_be_app+set}" = set; then : +if ${ac_cv_lib_be_be_app+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -12371,7 +12383,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" = x""yes; then : +if test "x$ac_cv_lib_be_be_app" = xyes; then : LIBS="$LIBS -lbe -lroot -lnet" else : @@ -12388,7 +12400,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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -12428,7 +12440,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 test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -12481,7 +12493,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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -12521,7 +12533,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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -12580,7 +12592,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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -12624,7 +12636,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 test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -12678,8 +12690,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 @@ -12708,7 +12720,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 test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12745,7 +12757,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 test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -12823,7 +12835,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 test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -12922,7 +12934,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 test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -13028,7 +13040,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 @@ -13039,7 +13051,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 test "${ol_cv_mkdep+set}" = set; then : +if ${ol_cv_mkdep+:} false; then : $as_echo_n "(cached) " >&6 else @@ -13089,7 +13101,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 test "${ac_cv_lib_s_afopen+set}" = set; then : +if ${ac_cv_lib_s_afopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13123,7 +13135,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" = x""yes; then : +if test "x$ac_cv_lib_s_afopen" = xyes; then : AUTH_LIBS=-ls @@ -13148,7 +13160,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" = x""yes; then : +if test "x$ac_cv_header_ltdl_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LTDL_H 1 _ACEOF @@ -13159,12 +13171,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 test "${ac_cv_lib_ltdl_lt_dlinit+set}" = set; then : +if ${ac_cv_lib_ltdl_lt_dlinit+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13198,7 +13210,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" = x""yes; then : +if test "x$ac_cv_lib_ltdl_lt_dlinit" = xyes; then : MODULES_LIBS=-lltdl @@ -13209,7 +13221,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 @@ -13236,7 +13248,7 @@ fi # test for EBCDIC { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EBCDIC" >&5 $as_echo_n "checking for EBCDIC... " >&6; } -if test "${ol_cv_cpp_ebcdic+set}" = set; then : +if ${ol_cv_cpp_ebcdic+:} false; then : $as_echo_n "(cached) " >&6 else @@ -13253,7 +13265,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ol_cv_cpp_ebcdic=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ol_cv_cpp_ebcdic" >&5 $as_echo "$ol_cv_cpp_ebcdic" >&6; } @@ -13265,7 +13277,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 test "${ol_cv_header_stdc+set}" = set; then : +if ${ol_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13280,7 +13292,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ol_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext if test $ol_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. @@ -13369,7 +13381,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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Header+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13396,8 +13408,7 @@ fi eval ac_res=\$$as_ac_Header { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 _ACEOF @@ -13410,7 +13421,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 test "${ac_cv_search_opendir+set}" = set; then : +if ${ac_cv_search_opendir+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -13444,11 +13455,11 @@ for ac_lib in '' dir; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_opendir+set}" = set; then : + if ${ac_cv_search_opendir+:} false; then : break fi done -if test "${ac_cv_search_opendir+set}" = set; then : +if ${ac_cv_search_opendir+:} false; then : else ac_cv_search_opendir=no @@ -13467,7 +13478,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 test "${ac_cv_search_opendir+set}" = set; then : +if ${ac_cv_search_opendir+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -13501,11 +13512,11 @@ for ac_lib in '' x; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_opendir+set}" = set; then : + if ${ac_cv_search_opendir+:} false; then : break fi done -if test "${ac_cv_search_opendir+set}" = set; then : +if ${ac_cv_search_opendir+:} false; then : else ac_cv_search_opendir=no @@ -13525,7 +13536,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 test "${ac_cv_header_sys_wait_h+set}" = set; then : +if ${ac_cv_header_sys_wait_h+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13566,7 +13577,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 test "${ac_cv_sys_tiocgwinsz_in_termios_h+set}" = set; then : +if ${ac_cv_sys_tiocgwinsz_in_termios_h+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13593,7 +13604,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 test "${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+set}" = set; then : +if ${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13677,8 +13688,7 @@ 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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -13696,8 +13706,7 @@ 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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -13714,7 +13723,7 @@ do : #include " -if test "x$ac_cv_header_resolv_h" = x""yes; then : +if test "x$ac_cv_header_resolv_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_RESOLV_H 1 _ACEOF @@ -13730,7 +13739,7 @@ do : #include " -if test "x$ac_cv_header_netinet_tcp_h" = x""yes; then : +if test "x$ac_cv_header_netinet_tcp_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_NETINET_TCP_H 1 _ACEOF @@ -13748,7 +13757,7 @@ do : #endif " -if test "x$ac_cv_header_sys_ucred_h" = x""yes; then : +if test "x$ac_cv_header_sys_ucred_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SYS_UCRED_H 1 _ACEOF @@ -13763,8 +13772,7 @@ 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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -13776,7 +13784,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 test "${ac_cv_lib_V3_sigset+set}" = set; then : +if ${ac_cv_lib_V3_sigset+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13810,7 +13818,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" = x""yes; then : +if test "x$ac_cv_lib_V3_sigset" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBV3 1 _ACEOF @@ -13828,7 +13836,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 test "${ol_cv_winsock+set}" = set; then : +if ${ol_cv_winsock+:} false; then : $as_echo_n "(cached) " >&6 else @@ -13893,13 +13901,13 @@ fi ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" -if test "x$ac_cv_func_socket" = x""yes; then : +if test "x$ac_cv_func_socket" = xyes; 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 test "${ac_cv_lib_socket_main+set}" = set; then : +if ${ac_cv_lib_socket_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13927,7 +13935,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" = x""yes; then : +if test "x$ac_cv_lib_socket_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBSOCKET 1 _ACEOF @@ -13938,7 +13946,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 test "${ac_cv_lib_net_socket+set}" = set; then : +if ${ac_cv_lib_net_socket+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13972,7 +13980,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" = x""yes; then : +if test "x$ac_cv_lib_net_socket" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBNET 1 _ACEOF @@ -13983,7 +13991,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 test "${ac_cv_lib_nsl_s_main+set}" = set; then : +if ${ac_cv_lib_nsl_s_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14011,7 +14019,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" = x""yes; then : +if test "x$ac_cv_lib_nsl_s_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSL_S 1 _ACEOF @@ -14022,7 +14030,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 test "${ac_cv_lib_nsl_main+set}" = set; then : +if ${ac_cv_lib_nsl_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14050,7 +14058,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" = x""yes; then : +if test "x$ac_cv_lib_nsl_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSL 1 _ACEOF @@ -14061,7 +14069,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 test "${ac_cv_lib_inet_socket+set}" = set; then : +if ${ac_cv_lib_inet_socket+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14095,7 +14103,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" = x""yes; then : +if test "x$ac_cv_lib_inet_socket" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBINET 1 _ACEOF @@ -14106,7 +14114,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 test "${ac_cv_lib_gen_main+set}" = set; then : +if ${ac_cv_lib_gen_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14134,7 +14142,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" = x""yes; then : +if test "x$ac_cv_lib_gen_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBGEN 1 _ACEOF @@ -14148,10 +14156,10 @@ fi ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select" -if test "x$ac_cv_func_select" = x""yes; then : +if test "x$ac_cv_func_select" = xyes; then : : else - as_fn_error "select() required." "$LINENO" 5 + as_fn_error $? "select() required." "$LINENO" 5 fi @@ -14160,8 +14168,7 @@ 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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -14172,7 +14179,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 test "${ac_cv_func_select_args+set}" = set; then : +if ${ac_cv_func_select_args+:} false; then : $as_echo_n "(cached) " >&6 else for ac_arg234 in 'fd_set *' 'int *' 'void *'; do @@ -14206,7 +14213,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 @@ -14239,8 +14246,7 @@ 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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -14253,8 +14259,7 @@ 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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -14269,8 +14274,7 @@ 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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -14314,8 +14318,7 @@ 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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -14359,7 +14362,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 test "${ol_cv_dcl_sys_errlist+set}" = set; then : +if ${ol_cv_dcl_sys_errlist+:} false; then : $as_echo_n "(cached) " >&6 else @@ -14399,7 +14402,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 test "${ol_cv_have_sys_errlist+set}" = set; then : +if ${ol_cv_have_sys_errlist+:} false; then : $as_echo_n "(cached) " >&6 else @@ -14434,8 +14437,7 @@ 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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -14447,7 +14449,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 test "${ol_cv_nonposix_strerror_r+set}" = set; then : +if ${ol_cv_nonposix_strerror_r+:} false; then : $as_echo_n "(cached) " >&6 else @@ -14523,7 +14525,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 test "${ol_cv_dcl_sys_errlist+set}" = set; then : +if ${ol_cv_dcl_sys_errlist+:} false; then : $as_echo_n "(cached) " >&6 else @@ -14563,7 +14565,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 test "${ol_cv_have_sys_errlist+set}" = set; then : +if ${ol_cv_have_sys_errlist+:} false; then : $as_echo_n "(cached) " >&6 else @@ -14606,7 +14608,7 @@ do : #endif " -if test "x$ac_cv_header_regex_h" = x""yes; then : +if test "x$ac_cv_header_regex_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_REGEX_H 1 _ACEOF @@ -14617,11 +14619,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 test "${ac_cv_search_regfree+set}" = set; then : +if ${ac_cv_search_regfree+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -14655,11 +14657,11 @@ for ac_lib in '' regex gnuregex; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_regfree+set}" = set; then : + if ${ac_cv_search_regfree+:} false; then : break fi done -if test "${ac_cv_search_regfree+set}" = set; then : +if ${ac_cv_search_regfree+:} false; then : else ac_cv_search_regfree=no @@ -14674,14 +14676,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 test "${ol_cv_c_posix_regex+set}" = set; then : +if ${ol_cv_c_posix_regex+:} false; then : $as_echo_n "(cached) " >&6 else @@ -14728,7 +14730,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 @@ -14736,7 +14738,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" = x""yes; then : +if test "x$ac_cv_header_sys_uuid_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SYS_UUID_H 1 _ACEOF @@ -14749,7 +14751,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 test "${ac_cv_search_uuid_to_str+set}" = set; then : +if ${ac_cv_search_uuid_to_str+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -14783,11 +14785,11 @@ for ac_lib in '' uuid; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_uuid_to_str+set}" = set; then : + if ${ac_cv_search_uuid_to_str+:} false; then : break fi done -if test "${ac_cv_search_uuid_to_str+set}" = set; then : +if ${ac_cv_search_uuid_to_str+:} false; then : else ac_cv_search_uuid_to_str=no @@ -14807,7 +14809,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 test "${ac_cv_search_uuid_create+set}" = set; then : +if ${ac_cv_search_uuid_create+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -14841,11 +14843,11 @@ for ac_lib in '' uuid; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_uuid_create+set}" = set; then : + if ${ac_cv_search_uuid_create+:} false; then : break fi done -if test "${ac_cv_search_uuid_create+set}" = set; then : +if ${ac_cv_search_uuid_create+:} false; then : else ac_cv_search_uuid_create=no @@ -14879,7 +14881,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" = x""yes; then : +if test "x$ac_cv_header_uuid_uuid_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_UUID_UUID_H 1 _ACEOF @@ -14892,7 +14894,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 test "${ac_cv_search_uuid_generate+set}" = set; then : +if ${ac_cv_search_uuid_generate+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -14926,11 +14928,11 @@ for ac_lib in '' uuid; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_uuid_generate+set}" = set; then : + if ${ac_cv_search_uuid_generate+:} false; then : break fi done -if test "${ac_cv_search_uuid_generate+set}" = set; then : +if ${ac_cv_search_uuid_generate+:} false; then : else ac_cv_search_uuid_generate=no @@ -14950,7 +14952,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 test "${ac_cv_search_uuid_unparse_lower+set}" = set; then : +if ${ac_cv_search_uuid_unparse_lower+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -14984,11 +14986,11 @@ for ac_lib in '' uuid; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_uuid_unparse_lower+set}" = set; then : + if ${ac_cv_search_uuid_unparse_lower+:} false; then : break fi done -if test "${ac_cv_search_uuid_unparse_lower+set}" = set; then : +if ${ac_cv_search_uuid_unparse_lower+:} false; then : else ac_cv_search_uuid_unparse_lower=no @@ -15060,7 +15062,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 test "${ol_cv_resolver_none+set}" = set; then : +if ${ol_cv_resolver_none+:} false; then : $as_echo_n "(cached) " >&6 else @@ -15141,7 +15143,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 test "${ol_cv_resolver_resolv+set}" = set; then : +if ${ol_cv_resolver_resolv+:} false; then : $as_echo_n "(cached) " >&6 else @@ -15222,7 +15224,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 test "${ol_cv_resolver_bind+set}" = set; then : +if ${ol_cv_resolver_bind+:} false; then : $as_echo_n "(cached) " >&6 else @@ -15319,7 +15321,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 @@ -15329,8 +15331,7 @@ 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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -15343,8 +15344,7 @@ 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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -15356,12 +15356,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 test "${ol_cv_inet6_addrstrlen+set}" = set; then : +if ${ol_cv_inet6_addrstrlen+:} false; then : $as_echo_n "(cached) " >&6 else @@ -15389,7 +15389,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 test "${ol_cv_struct_sockaddr_storage+set}" = set; then : +if ${ol_cv_struct_sockaddr_storage+:} false; then : $as_echo_n "(cached) " >&6 else @@ -15424,10 +15424,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,8 +15436,7 @@ 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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -15450,7 +15449,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 @@ -15464,7 +15463,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" = x""yes; then : +if test "x$ac_cv_header_openssl_ssl_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_OPENSSL_SSL_H 1 _ACEOF @@ -15477,7 +15476,7 @@ 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 test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then : +if ${ac_cv_lib_ssl_SSL_library_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -15511,7 +15510,7 @@ 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" = x""yes; then : +if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then : have_openssl=yes need_rsaref=no else @@ -15522,7 +15521,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 test "${ac_cv_lib_ssl_ssl3_accept+set}" = set; then : +if ${ac_cv_lib_ssl_ssl3_accept+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -15556,7 +15555,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" = x""yes; then : +if test "x$ac_cv_lib_ssl_ssl3_accept" = xyes; then : have_openssl=yes need_rsaref=yes else @@ -15585,7 +15584,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 test "${ol_cv_ssl_crl_compat+set}" = set; then : +if ${ol_cv_ssl_crl_compat+:} false; then : $as_echo_n "(cached) " >&6 else @@ -15628,7 +15627,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" = x""yes; then : +if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_GNUTLS_GNUTLS_H 1 _ACEOF @@ -15641,7 +15640,7 @@ done if test $ac_cv_header_gnutls_gnutls_h = yes ; then { $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 test "${ac_cv_lib_gnutls_gnutls_init+set}" = set; then : +if ${ac_cv_lib_gnutls_gnutls_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -15675,7 +15674,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" = x""yes; then : +if test "x$ac_cv_lib_gnutls_gnutls_init" = xyes; then : have_gnutls=yes else have_gnutls=no @@ -15702,7 +15701,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" = x""yes; then : +if test "x$ac_cv_header_nssutil_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_NSSUTIL_H 1 _ACEOF @@ -15714,7 +15713,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 test "${ac_cv_lib_nss3_NSS_Initialize+set}" = set; then : +if ${ac_cv_lib_nss3_NSS_Initialize+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -15748,7 +15747,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" = x""yes; then : +if test "x$ac_cv_lib_nss3_NSS_Initialize" = xyes; then : have_moznss=yes else have_moznss=no @@ -15765,7 +15764,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 @@ -15783,7 +15782,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;} @@ -15791,7 +15790,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 @@ -15805,7 +15804,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" = x""yes; then : +if test "x$ac_cv_func__beginthread" = xyes; then : fi @@ -15832,7 +15831,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 @@ -15842,7 +15841,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" = x""yes; then : +if test "x$ac_cv_header_pthread_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_PTHREAD_H 1 _ACEOF @@ -15855,7 +15854,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 test "${ol_cv_pthread_version+set}" = set; then : +if ${ol_cv_pthread_version+:} false; then : $as_echo_n "(cached) " >&6 else @@ -15953,7 +15952,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 @@ -15962,7 +15961,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 test "${ol_cv_header_linux_threads+set}" = set; then : +if ${ol_cv_header_linux_threads+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15990,7 +15989,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 test "${ol_cv_header_gnu_pth_pthread_h+set}" = set; then : +if ${ol_cv_header_gnu_pth_pthread_h+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16019,7 +16018,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" = x""yes; then : +if test "x$ac_cv_header_sched_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SCHED_H 1 _ACEOF @@ -16033,7 +16032,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 test "${ol_cv_pthread_create+set}" = set; then : +if ${ol_cv_pthread_create+:} false; then : $as_echo_n "(cached) " >&6 else @@ -16214,7 +16213,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 test "${ol_cv_pthread_kthread+set}" = set; then : +if ${ol_cv_pthread_kthread+:} false; then : $as_echo_n "(cached) " >&6 else @@ -16404,7 +16403,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 test "${ol_cv_pthread_pthread+set}" = set; then : +if ${ol_cv_pthread_pthread+:} false; then : $as_echo_n "(cached) " >&6 else @@ -16594,7 +16593,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 test "${ol_cv_pthread_pthreads+set}" = set; then : +if ${ol_cv_pthread_pthreads+:} false; then : $as_echo_n "(cached) " >&6 else @@ -16784,7 +16783,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 test "${ol_cv_pthread_mthreads+set}" = set; then : +if ${ol_cv_pthread_mthreads+:} false; then : $as_echo_n "(cached) " >&6 else @@ -16974,7 +16973,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 test "${ol_cv_pthread_thread+set}" = set; then : +if ${ol_cv_pthread_thread+:} false; then : $as_echo_n "(cached) " >&6 else @@ -17165,7 +17164,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 test "${ol_cv_pthread_lpthread_lmach_lexc_lc_r+set}" = set; then : +if ${ol_cv_pthread_lpthread_lmach_lexc_lc_r+:} false; then : $as_echo_n "(cached) " >&6 else @@ -17355,7 +17354,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 test "${ol_cv_pthread_lpthread_lmach_lexc+set}" = set; then : +if ${ol_cv_pthread_lpthread_lmach_lexc+:} false; then : $as_echo_n "(cached) " >&6 else @@ -17546,7 +17545,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 test "${ol_cv_pthread_lib_lpthread_woff+set}" = set; then : +if ${ol_cv_pthread_lib_lpthread_woff+:} false; then : $as_echo_n "(cached) " >&6 else @@ -17737,7 +17736,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 test "${ol_cv_pthread_lpthread+set}" = set; then : +if ${ol_cv_pthread_lpthread+:} false; then : $as_echo_n "(cached) " >&6 else @@ -17927,7 +17926,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 test "${ol_cv_pthread_lc_r+set}" = set; then : +if ${ol_cv_pthread_lc_r+:} false; then : $as_echo_n "(cached) " >&6 else @@ -18118,7 +18117,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 test "${ol_cv_pthread_threads+set}" = set; then : +if ${ol_cv_pthread_threads+:} false; then : $as_echo_n "(cached) " >&6 else @@ -18309,7 +18308,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 test "${ol_cv_pthread_lpthreads_lmach_lexc_lc_r+set}" = set; then : +if ${ol_cv_pthread_lpthreads_lmach_lexc_lc_r+:} false; then : $as_echo_n "(cached) " >&6 else @@ -18499,7 +18498,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 test "${ol_cv_pthread_lpthreads_lmach_lexc+set}" = set; then : +if ${ol_cv_pthread_lpthreads_lmach_lexc+:} false; then : $as_echo_n "(cached) " >&6 else @@ -18689,7 +18688,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 test "${ol_cv_pthread_lpthreads_lexc+set}" = set; then : +if ${ol_cv_pthread_lpthreads_lexc+:} false; then : $as_echo_n "(cached) " >&6 else @@ -18880,7 +18879,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 test "${ol_cv_pthread_lib_lpthreads+set}" = set; then : +if ${ol_cv_pthread_lib_lpthreads+:} false; then : $as_echo_n "(cached) " >&6 else @@ -19077,8 +19076,7 @@ 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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -19092,7 +19090,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 test "${ac_cv_lib_rt_sched_yield+set}" = set; then : +if ${ac_cv_lib_rt_sched_yield+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19126,7 +19124,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" = x""yes; then : +if test "x$ac_cv_lib_rt_sched_yield" = xyes; then : LTHREAD_LIBS="$LTHREAD_LIBS -lrt" $as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h @@ -19147,7 +19145,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" = x""yes; then : +if test "x$ac_cv_func_pthread_kill" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_PTHREAD_KILL 1 _ACEOF @@ -19158,7 +19156,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 test "${ol_cv_func_pthread_rwlock_destroy+set}" = set; then : +if ${ol_cv_func_pthread_rwlock_destroy+:} false; then : $as_echo_n "(cached) " >&6 else @@ -19195,7 +19193,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 test "${ol_cv_func_pthread_detach+set}" = set; then : +if ${ol_cv_func_pthread_detach+:} false; then : $as_echo_n "(cached) " >&6 else @@ -19228,7 +19226,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 @@ -19244,8 +19242,7 @@ $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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -19258,7 +19255,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" = x""yes; then : +if test "x$ac_cv_func_pthread_kill_other_threads_np" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_PTHREAD_KILL_OTHER_THREADS_NP 1 _ACEOF @@ -19268,7 +19265,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LinuxThreads implementation" >&5 $as_echo_n "checking for LinuxThreads implementation... " >&6; } -if test "${ol_cv_sys_linux_threads+set}" = set; then : +if ${ol_cv_sys_linux_threads+:} false; then : $as_echo_n "(cached) " >&6 else ol_cv_sys_linux_threads=$ac_cv_func_pthread_kill_other_threads_np @@ -19281,7 +19278,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 test "${ol_cv_linux_threads+set}" = set; then : +if ${ol_cv_linux_threads+:} false; then : $as_echo_n "(cached) " >&6 else @@ -19301,12 +19298,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 test "${ol_cv_pthread_create_works+set}" = set; then : +if ${ol_cv_pthread_create_works+:} false; then : $as_echo_n "(cached) " >&6 else @@ -19400,7 +19397,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 @@ -19414,7 +19411,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 test "${ol_cv_pthread_select_yields+set}" = set; then : +if ${ol_cv_pthread_select_yields+:} false; then : $as_echo_n "(cached) " >&6 else @@ -19512,7 +19509,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 @@ -19523,12 +19520,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 @@ -19539,8 +19536,7 @@ 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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -19553,7 +19549,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" = x""yes; then : +if test "x$ac_cv_func_cthread_fork" = xyes; then : ol_link_threads=yes fi @@ -19561,7 +19557,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 test "${ol_cv_cthread_all_load+set}" = set; then : +if ${ol_cv_cthread_all_load+:} false; then : $as_echo_n "(cached) " >&6 else @@ -19607,7 +19603,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" = x""yes; then : +if test "x$ac_cv_func_cthread_fork" = xyes; then : ol_link_threads=yes fi @@ -19618,11 +19614,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 @@ -19630,7 +19626,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 @@ -19640,7 +19636,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" = x""yes; then : +if test "x$ac_cv_header_pth_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_PTH_H 1 _ACEOF @@ -19653,7 +19649,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 test "${ac_cv_lib_pth_pth_version+set}" = set; then : +if ${ac_cv_lib_pth_pth_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19687,7 +19683,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" = x""yes; then : +if test "x$ac_cv_lib_pth_pth_version" = xyes; then : have_pth=yes else have_pth=no @@ -19716,8 +19712,7 @@ 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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -19730,7 +19725,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 test "${ac_cv_lib_thread_thr_create+set}" = set; then : +if ${ac_cv_lib_thread_thr_create+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19764,7 +19759,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" = x""yes; then : +if test "x$ac_cv_lib_thread_thr_create" = xyes; then : have_thr=yes else have_thr=no @@ -19789,8 +19784,7 @@ $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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -19819,8 +19813,7 @@ $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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -19833,8 +19826,7 @@ 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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -19845,7 +19837,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 test "${ol_cv_header_linux_threads+set}" = set; then : +if ${ol_cv_header_linux_threads+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19874,7 +19866,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" = x""yes; then : +if test "x$ac_cv_header_mach_cthreads_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_MACH_CTHREADS_H 1 _ACEOF @@ -19887,8 +19879,7 @@ 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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -19917,7 +19908,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 test "${ol_cv_errno_thread_specific+set}" = set; then : +if ${ol_cv_errno_thread_specific+:} false; then : $as_echo_n "(cached) " >&6 else @@ -19946,7 +19937,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 test "${ol_cv_h_errno_thread_specific+set}" = set; then : +if ${ol_cv_h_errno_thread_specific+:} false; then : $as_echo_n "(cached) " >&6 else @@ -19983,7 +19974,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 @@ -20015,8 +20006,7 @@ 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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -20030,7 +20020,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 test "${ol_cv_func_ctime_r_nargs+set}" = set; then : +if ${ol_cv_func_ctime_r_nargs+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -20100,7 +20090,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 test "${ol_cv_func_gethostbyname_r_nargs+set}" = set; then : +if ${ol_cv_func_gethostbyname_r_nargs+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -20186,7 +20176,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 test "${ol_cv_func_gethostbyaddr_r_nargs+set}" = set; then : +if ${ol_cv_func_gethostbyaddr_r_nargs+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -20276,12 +20266,12 @@ fi ol_link_bdb=no -if test $ol_enable_bdb/$ol_enable_hdb != no/no; then +if test $ol_enable_deprecated_bdb/$ol_enable_deprecated_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" = x""yes; then : +if test "x$ac_cv_header_db_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DB_H 1 _ACEOF @@ -20293,7 +20283,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 test "${ol_cv_bdb_major+set}" = set; then : +if ${ol_cv_bdb_major+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20314,12 +20304,12 @@ 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 test "${ol_cv_bdb_minor+set}" = set; then : +if ${ol_cv_bdb_minor+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20340,12 +20330,12 @@ 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 test "${ol_cv_bdb_compat+set}" = set; then : +if ${ol_cv_bdb_compat+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20384,7 +20374,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 @@ -20393,7 +20383,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 test "${ol_cv_db_db_5_dot_m+set}" = set; then : +if ${ol_cv_db_db_5_dot_m+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20456,7 +20446,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 test "${ol_cv_db_db5m+set}" = set; then : +if ${ol_cv_db_db5m+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20519,7 +20509,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 test "${ol_cv_db_db_5m+set}" = set; then : +if ${ol_cv_db_db_5m+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20582,7 +20572,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 test "${ol_cv_db_db_5_m+set}" = set; then : +if ${ol_cv_db_db_5_m+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20645,7 +20635,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 test "${ol_cv_db_db_5+set}" = set; then : +if ${ol_cv_db_db_5+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20708,7 +20698,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 test "${ol_cv_db_db5+set}" = set; then : +if ${ol_cv_db_db5+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20772,7 +20762,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 test "${ol_cv_db_db_4_dot_m+set}" = set; then : +if ${ol_cv_db_db_4_dot_m+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20835,7 +20825,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 test "${ol_cv_db_db4m+set}" = set; then : +if ${ol_cv_db_db4m+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20898,7 +20888,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 test "${ol_cv_db_db_4m+set}" = set; then : +if ${ol_cv_db_db_4m+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20961,7 +20951,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 test "${ol_cv_db_db_4_m+set}" = set; then : +if ${ol_cv_db_db_4_m+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21024,7 +21014,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 test "${ol_cv_db_db_4+set}" = set; then : +if ${ol_cv_db_db_4+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21087,7 +21077,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 test "${ol_cv_db_db4+set}" = set; then : +if ${ol_cv_db_db4+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21151,7 +21141,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 test "${ol_cv_db_db+set}" = set; then : +if ${ol_cv_db_db+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21214,7 +21204,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 test "${ol_cv_db_none+set}" = set; then : +if ${ol_cv_db_none+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21279,7 +21269,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 test "${ol_cv_berkeley_db_version+set}" = set; then : +if ${ol_cv_berkeley_db_version+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21345,12 +21335,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 test "${ol_cv_berkeley_db_thread+set}" = set; then : +if ${ol_cv_berkeley_db_thread+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21457,7 +21447,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 @@ -21489,7 +21479,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" = x""yes; then : +if test "x$ac_cv_header_tcpd_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_TCPD_H 1 _ACEOF @@ -21574,7 +21564,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 apppropriate 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;} @@ -21584,13 +21574,12 @@ 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" = x""yes; then : +if test "x$ac_cv_func_openlog" = xyes; then : fi if test $ac_cv_func_openlog = no && test $ol_enable_syslog = yes; then - { as_fn_set_status select appropriate options or disable -as_fn_error "could not find syslog" "$LINENO" 5; } + as_fn_error select appropriate options or disable "could not find syslog" "$LINENO" 5 fi ol_enable_syslog=$ac_cv_func_openlog fi @@ -21601,15 +21590,14 @@ 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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = 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 @@ -21629,7 +21617,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 test "${ac_cv_lib_iodbc_SQLDriverConnect+set}" = set; then : +if ${ac_cv_lib_iodbc_SQLDriverConnect+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -21663,7 +21651,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" = x""yes; then : +if test "x$ac_cv_lib_iodbc_SQLDriverConnect" = xyes; then : have_iodbc=yes else have_iodbc=no @@ -21677,7 +21665,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 test "${ac_cv_lib_odbc_SQLDriverConnect+set}" = set; then : +if ${ac_cv_lib_odbc_SQLDriverConnect+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -21711,7 +21699,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" = x""yes; then : +if test "x$ac_cv_lib_odbc_SQLDriverConnect" = xyes; then : have_odbc=yes else have_odbc=no @@ -21725,7 +21713,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 test "${ac_cv_lib_odbc32_SQLDriverConnect+set}" = set; then : +if ${ac_cv_lib_odbc32_SQLDriverConnect+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -21759,7 +21747,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" = x""yes; then : +if test "x$ac_cv_lib_odbc32_SQLDriverConnect" = xyes; then : have_odbc32=yes else have_odbc32=no @@ -21804,7 +21792,7 @@ $as_echo "$have_odbc32" >&6; } ;; *) - as_fn_error "unknown ODBC library" "$LINENO" 5 + as_fn_error $? "unknown ODBC library" "$LINENO" 5 ;; esac fi @@ -21816,7 +21804,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 @@ -21826,7 +21814,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 test "${ac_cv_prog_MYSQL+set}" = set; then : +if ${ac_cv_prog_MYSQL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$MYSQL"; then @@ -21860,7 +21848,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` @@ -21878,10 +21866,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.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext CPPFLAGS="$save_CPPFLAGS" SQL_LIB=`mysql_config --libs_r` @@ -21892,7 +21880,7 @@ rm -f conftest.err 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 test "${ac_cv_lib_ndbclient_ndb_init+set}" = set; then : +if ${ac_cv_lib_ndbclient_ndb_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -21926,11 +21914,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" = x""yes; then : +if test "x$ac_cv_lib_ndbclient_ndb_init" = xyes; then : : ok else - as_fn_error "could not locate ndbclient library" "$LINENO" 5 + as_fn_error $? "could not locate ndbclient library" "$LINENO" 5 fi @@ -21947,8 +21935,7 @@ 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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -21962,7 +21949,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 test "${ol_cv_lib_icu+set}" = set; then : +if ${ol_cv_lib_icu+:} false; then : $as_echo_n "(cached) " >&6 else @@ -22018,8 +22005,7 @@ 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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -22033,7 +22019,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 test "${ac_cv_lib_sasl2_sasl_client_init+set}" = set; then : +if ${ac_cv_lib_sasl2_sasl_client_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22067,12 +22053,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" = x""yes; then : +if test "x$ac_cv_lib_sasl2_sasl_client_init" = xyes; 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 test "${ac_cv_lib_sasl_sasl_client_init+set}" = set; then : +if ${ac_cv_lib_sasl_sasl_client_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22106,7 +22092,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" = x""yes; then : +if test "x$ac_cv_lib_sasl_sasl_client_init" = xyes; then : ol_link_sasl="-lsasl" fi @@ -22116,7 +22102,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;} @@ -22130,7 +22116,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 test "${ol_cv_sasl_compat+set}" = set; then : +if ${ol_cv_sasl_compat+:} false; then : $as_echo_n "(cached) " >&6 else @@ -22166,7 +22152,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 @@ -22180,7 +22166,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" = x""yes; then : +if test "x$ac_cv_func_sasl_version" = xyes; then : $as_echo "#define HAVE_SASL_VERSION 1" >>confdefs.h @@ -22229,7 +22215,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 test "${ol_cv_lib_fetch+set}" = set; then : +if ${ol_cv_lib_fetch+:} false; then : $as_echo_n "(cached) " >&6 else @@ -22273,7 +22259,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 @@ -22282,14 +22268,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" = x""yes; then : +if test "x$ac_cv_func_crypt" = xyes; 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 test "${ac_cv_lib_crypt_crypt+set}" = set; then : +if ${ac_cv_lib_crypt_crypt+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22323,7 +22309,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" = x""yes; then : +if test "x$ac_cv_lib_crypt_crypt" = xyes; then : LUTIL_LIBS="$LUTIL_LIBS -lcrypt" have_crypt=yes else @@ -22343,7 +22329,7 @@ $as_echo "#define HAVE_CRYPT 1" >>confdefs.h { $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 @@ -22354,13 +22340,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" = x""yes; then : +if test "x$ac_cv_func_setproctitle" = xyes; 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 test "${ac_cv_lib_util_setproctitle+set}" = set; then : +if ${ac_cv_lib_util_setproctitle+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22394,7 +22380,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" = x""yes; then : +if test "x$ac_cv_lib_util_setproctitle" = xyes; then : have_setproctitle=yes LUTIL_LIBS="$LUTIL_LIBS -lutil" else @@ -22423,8 +22409,7 @@ 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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -22437,7 +22422,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 test "${ac_cv_lib_slp_SLPOpen+set}" = set; then : +if ${ac_cv_lib_slp_SLPOpen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22471,7 +22456,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" = x""yes; then : +if test "x$ac_cv_lib_slp_SLPOpen" = xyes; then : have_slp=yes else have_slp=no @@ -22485,13 +22470,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" = x""yes; then : +if test "x$ac_cv_type_mode_t" = xyes; then : else @@ -22502,7 +22487,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" = x""yes; then : +if test "x$ac_cv_type_off_t" = xyes; then : else @@ -22513,7 +22498,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" = x""yes; then : +if test "x$ac_cv_type_pid_t" = xyes; then : else @@ -22524,7 +22509,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" = x""yes; then : +if test "x$ac_cv_type_ssize_t" = xyes; then : else @@ -22535,7 +22520,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" = x""yes; then : +if test "x$ac_cv_type_caddr_t" = xyes; then : else @@ -22546,7 +22531,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" = x""yes; then : +if test "x$ac_cv_type_size_t" = xyes; then : else @@ -22558,7 +22543,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" = x""yes; then : +if test "x$ac_cv_type_long_long" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LONG_LONG 1 @@ -22568,7 +22553,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" = x""yes; then : +if test "x$ac_cv_type_ptrdiff_t" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_PTRDIFF_T 1 @@ -22584,14 +22569,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" = x""yes; then : +if test "x$ac_cv_type_socklen_t" = xyes; 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 test "${ol_cv_type_ber_socklen_t+set}" = set; then : +if ${ol_cv_type_ber_socklen_t+:} false; then : $as_echo_n "(cached) " >&6 else @@ -22643,7 +22628,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 test "${ac_cv_type_signal+set}" = set; then : +if ${ac_cv_type_signal+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -22679,7 +22664,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" = x""yes; then : +if test "x$ac_cv_type_sig_atomic_t" = xyes; then : else @@ -22692,7 +22677,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 test "${ac_cv_type_uid_t+set}" = set; then : +if ${ac_cv_type_uid_t+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -22723,7 +22708,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 test "${ac_cv_header_time+set}" = set; then : +if ${ac_cv_header_time+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -22758,7 +22743,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 test "${ac_cv_struct_tm+set}" = set; then : +if ${ac_cv_struct_tm+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -22792,7 +22777,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" = x""yes; then : +if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_BLKSIZE 1 @@ -22804,7 +22789,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" = x""yes; then : +if test "x$ac_cv_member_struct_passwd_pw_gecos" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_PASSWD_PW_GECOS 1 @@ -22816,7 +22801,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" = x""yes; then : +if test "x$ac_cv_member_struct_passwd_pw_passwd" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_PASSWD_PW_PASSWD 1 @@ -22828,7 +22813,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 test "${ol_cv_c_upper_lower+set}" = set; then : +if ${ol_cv_c_upper_lower+:} false; then : $as_echo_n "(cached) " >&6 else @@ -22867,7 +22852,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 test "${ac_cv_c_const+set}" = set; then : +if ${ac_cv_c_const+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -22947,7 +22932,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 test "${ol_cv_c_volatile+set}" = set; then : +if ${ol_cv_c_volatile+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -22990,7 +22975,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 test "${ac_cv_c_bigendian+set}" = set; then : +if ${ac_cv_c_bigendian+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_bigendian=unknown @@ -23208,7 +23193,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 @@ -23220,7 +23205,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 test "${ac_cv_sizeof_short+set}" = set; then : +if ${ac_cv_sizeof_short+:} false; 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 : @@ -23229,9 +23214,8 @@ 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_set_status 77 -as_fn_error "cannot compute sizeof (short) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (short) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_short=0 fi @@ -23254,7 +23238,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 test "${ac_cv_sizeof_int+set}" = set; then : +if ${ac_cv_sizeof_int+:} false; 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 : @@ -23263,9 +23247,8 @@ 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_set_status 77 -as_fn_error "cannot compute sizeof (int) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (int) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_int=0 fi @@ -23288,7 +23271,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 test "${ac_cv_sizeof_long+set}" = set; then : +if ${ac_cv_sizeof_long+:} false; 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 : @@ -23297,9 +23280,8 @@ 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_set_status 77 -as_fn_error "cannot compute sizeof (long) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (long) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long=0 fi @@ -23322,7 +23304,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 test "${ac_cv_sizeof_long_long+set}" = set; then : +if ${ac_cv_sizeof_long_long+:} false; 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 : @@ -23331,9 +23313,8 @@ 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_set_status 77 -as_fn_error "cannot compute sizeof (long long) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (long long) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_long=0 fi @@ -23356,7 +23337,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 test "${ac_cv_sizeof_wchar_t+set}" = set; then : +if ${ac_cv_sizeof_wchar_t+:} false; 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 : @@ -23365,9 +23346,8 @@ 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_set_status 77 -as_fn_error "cannot compute sizeof (wchar_t) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (wchar_t) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_wchar_t=0 fi @@ -23415,7 +23395,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 @@ -23425,14 +23405,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" = x""yes; then : +if test "x$ac_cv_header_openssl_bn_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_OPENSSL_BN_H 1 _ACEOF @@ -23444,7 +23424,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" = x""yes; then : +if test "x$ac_cv_header_openssl_crypto_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_OPENSSL_CRYPTO_H 1 _ACEOF @@ -23461,14 +23441,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" = x""yes; then : +if test "x$ac_cv_header_gmp_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_GMP_H 1 _ACEOF @@ -23479,7 +23459,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 test "${ac_cv_lib_gmp___gmpz_add_ui+set}" = set; then : +if ${ac_cv_lib_gmp___gmpz_add_ui+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23513,7 +23493,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" = x""yes; then : +if test "x$ac_cv_lib_gmp___gmpz_add_ui" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBGMP 1 _ACEOF @@ -23528,7 +23508,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 @@ -23537,7 +23517,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 $as_echo_n "checking for working memcmp... " >&6; } -if test "${ac_cv_func_memcmp_working+set}" = set; then : +if ${ac_cv_func_memcmp_working+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -23607,7 +23587,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" = x""yes; then : +if test "x$ac_cv_func_strftime" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRFTIME 1 _ACEOF @@ -23616,7 +23596,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 test "${ac_cv_lib_intl_strftime+set}" = set; then : +if ${ac_cv_lib_intl_strftime+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23650,7 +23630,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" = x""yes; then : +if test "x$ac_cv_lib_intl_strftime" = xyes; then : $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h LIBS="-lintl $LIBS" @@ -23662,7 +23642,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton()" >&5 $as_echo_n "checking for inet_aton()... " >&6; } -if test "${ol_cv_func_inet_aton+set}" = set; then : +if ${ol_cv_func_inet_aton+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -23709,7 +23689,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" = x""yes; then : +if test "x$ac_cv_func__spawnlp" = xyes; then : $as_echo "#define HAVE_SPAWNLP 1" >>confdefs.h @@ -23717,7 +23697,7 @@ fi ac_fn_c_check_func "$LINENO" "_snprintf" "ac_cv_func__snprintf" -if test "x$ac_cv_func__snprintf" = x""yes; then : +if test "x$ac_cv_func__snprintf" = xyes; then : ac_cv_func_snprintf=yes $as_echo "#define snprintf _snprintf" >>confdefs.h @@ -23730,8 +23710,7 @@ 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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -23750,13 +23729,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" = x""yes; then : +if test "x$ac_cv_func_vprintf" = xyes; 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" = x""yes; then : +if test "x$ac_cv_func__doprnt" = xyes; then : $as_echo "#define HAVE_DOPRNT 1" >>confdefs.h @@ -23772,8 +23751,7 @@ 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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -23844,8 +23822,7 @@ 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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -23854,25 +23831,31 @@ fi done -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 +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 - *" $ac_func.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" + *" 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 + +else + case " $LIBOBJS " in + *" getpeereid.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS getpeereid.$ac_objext" ;; esac fi -done @@ -23885,8 +23868,7 @@ 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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -23900,7 +23882,7 @@ done #include #endif " -if test "x$ac_cv_member_struct_msghdr_msg_accrightslen" = x""yes; then : +if test "x$ac_cv_member_struct_msghdr_msg_accrightslen" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTSLEN 1 @@ -23915,7 +23897,7 @@ fi #include #endif " -if test "x$ac_cv_member_struct_msghdr_msg_control" = x""yes; then : +if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1 @@ -23926,7 +23908,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" = x""yes; then : +if test "x$ac_cv_member_struct_stat_st_fstype" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_FSTYPE 1 @@ -23935,7 +23917,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" = x""yes; then : +if test "x$ac_cv_member_struct_stat_st_vfstype" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_VFSTYPE 1 @@ -23983,7 +23965,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" = x""yes; then : +if test "x$ac_cv_header_ltdl_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LTDL_H 1 _ACEOF @@ -23994,11 +23976,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 test "${ac_cv_lib_ltdl_lt_dlinit+set}" = set; then : +if ${ac_cv_lib_ltdl_lt_dlinit+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -24032,7 +24014,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" = x""yes; then : +if test "x$ac_cv_lib_ltdl_lt_dlinit" = xyes; then : SLAPI_LIBS=-lltdl LIBSLAPI=slapi/libslapi.la @@ -24041,7 +24023,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 @@ -24113,7 +24095,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 @@ -24164,10 +24146,10 @@ _ACEOF fi -if test "$ol_enable_bdb" != no ; then +if test "$ol_enable_deprecated_bdb" != no ; then BUILD_SLAPD=yes - BUILD_BDB=$ol_enable_bdb - if test "$ol_enable_bdb" = mod ; then + BUILD_BDB=$ol_enable_deprecated_bdb + if test "$ol_enable_deprecated_bdb" = mod ; then SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-bdb" MFLAG=SLAPD_MOD_DYNAMIC else @@ -24198,10 +24180,10 @@ _ACEOF fi -if test "$ol_enable_hdb" != no ; then +if test "$ol_enable_deprecated_hdb" != no ; then BUILD_SLAPD=yes - BUILD_HDB=$ol_enable_hdb - if test "$ol_enable_hdb" = mod ; then + BUILD_HDB=$ol_enable_deprecated_hdb + if test "$ol_enable_deprecated_hdb" = mod ; then SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-hdb" MFLAG=SLAPD_MOD_DYNAMIC else @@ -24864,6 +24846,7 @@ 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$//' @@ -24879,20 +24862,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" @@ -24993,6 +24976,7 @@ 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 @@ -25038,19 +25022,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS 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=$?; 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 + 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 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -25246,7 +25230,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 @@ -25300,7 +25284,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.65. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -25366,10 +25350,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.65, +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -25386,11 +25370,16 @@ 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 @@ -25412,6 +25401,7 @@ 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;; @@ -25424,7 +25414,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 ;; @@ -25433,7 +25423,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" @@ -25538,7 +25528,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 @@ -25561,9 +25551,10 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -25571,12 +25562,13 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -25593,12 +25585,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 {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -25607,18 +25599,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 @@ -25626,7 +25618,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -25674,7 +25666,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -25706,21 +25698,29 @@ 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 < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 +fi < "$ac_tmp/subs1.awk" > "$ac_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 $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries 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[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -25732,7 +25732,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 >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -25744,11 +25744,11 @@ _ACEOF # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; 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 +25833,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 +25846,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 +25865,7 @@ do for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_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 +25874,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "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 +25900,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -26031,23 +26031,24 @@ 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 "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 +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 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { 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"; } && { $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 "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_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) # @@ -26056,21 +26057,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 "$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 + && 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 { $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 "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + && eval '$AWK -f "$ac_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 @@ -26321,7 +26322,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. @@ -26342,7 +26343,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 $? + $ac_cs_success || as_fn_exit 1 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 -- 2.39.5