diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3766 |
1 files changed, 1969 insertions, 1797 deletions
@@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65. +# Generated by GNU Autoconf 2.69. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -89,6 +87,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 @@ -133,6 +132,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # 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 +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+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -166,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -211,14 +236,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # 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. - 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+"$@"} + export CONFIG_SHELL + # 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 +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+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -316,10 +352,18 @@ $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 + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -356,19 +400,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 @@ -441,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -475,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -496,28 +544,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -682,7 +710,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null exec 6>&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` @@ -1155,8 +1183,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. @@ -1201,7 +1230,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 @@ -1227,7 +1256,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 @@ -1431,7 +1460,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 @@ -1447,7 +1476,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 @@ -1477,8 +1506,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" ;; *=*) @@ -1486,7 +1515,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 ;; @@ -1496,7 +1525,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 @@ -1504,13 +1533,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 @@ -1533,7 +1562,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' @@ -1547,8 +1576,6 @@ 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 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1563,9 +1590,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. @@ -1604,11 +1631,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 @@ -1648,7 +1675,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 @@ -2041,8 +2068,9 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> CPP C preprocessor - YACC The `Yet Another C Compiler' implementation to use. Defaults to - the first program found out of: `bison -y', `byacc', `yacc'. + YACC The `Yet Another Compiler Compiler' implementation to use. + Defaults to the first program found out of: `bison -y', `byacc', + `yacc'. YFLAGS The list of arguments that will be passed by default to $YACC. This script will default YFLAGS to the empty string to avoid a default value of `-d' given by some make applications. @@ -2117,9 +2145,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.69 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2163,7 +2191,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 @@ -2189,7 +2217,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 : @@ -2200,7 +2228,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 @@ -2213,10 +2241,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 @@ -2252,7 +2280,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; } @@ -2279,7 +2307,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&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" @@ -2288,7 +2316,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 @@ -2329,7 +2357,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 @@ -2343,7 +2371,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 @@ -2361,7 +2389,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 @@ -2392,7 +2420,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2406,7 +2434,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 @@ -2419,7 +2447,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 @@ -2474,7 +2502,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 @@ -2487,7 +2515,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 @@ -2531,19 +2559,22 @@ 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 -# ac_fn_c_check_decl LINENO SYMBOL VAR -# ------------------------------------ -# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. ac_fn_c_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 -$as_echo_n "checking whether $2 is declared... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2552,8 +2583,12 @@ $4 int main () { -#ifndef $2 - (void) $2; +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif #endif ; @@ -2570,7 +2605,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_decl @@ -2591,7 +2626,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2607,7 +2643,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2633,7 +2670,8 @@ int main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2649,7 +2687,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2683,7 +2722,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2747,7 +2787,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 @@ -2761,7 +2801,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" @@ -2802,7 +2842,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 @@ -2839,7 +2879,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_cxx_try_compile @@ -2865,7 +2905,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_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then : @@ -2876,7 +2916,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_cxx_try_cpp @@ -2885,7 +2925,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.69. Invocation command line was $ $0 $@ @@ -2995,11 +3035,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -3033,11 +3071,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 @@ -3050,11 +3086,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 @@ -3068,11 +3102,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -3127,7 +3159,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 @@ -3142,7 +3179,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 @@ -3219,7 +3260,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. ## @@ -3238,7 +3279,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $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 @@ -3252,7 +3293,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -3287,7 +3328,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 @@ -3301,7 +3342,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 @@ -3318,7 +3359,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -3353,7 +3394,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 @@ -3368,7 +3409,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } { $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. @@ -3494,16 +3535,22 @@ EOF ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; 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 \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -3517,27 +3564,27 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # 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='-' @@ -3555,14 +3602,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 @@ -3570,7 +3617,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='-' @@ -3588,14 +3635,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 @@ -3603,7 +3650,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='-' @@ -3630,7 +3677,7 @@ test -n "$target_alias" && host_alias=$host fi if test -z "$host_alias"; then - as_fn_error "host_alias is not set!" "$LINENO" 5 + as_fn_error $? "host_alias is not set!" "$LINENO" 5 fi @@ -3641,7 +3688,7 @@ ac_config_headers="$ac_config_headers main/php_config.h" PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=5 -PHP_RELEASE_VERSION=3 +PHP_RELEASE_VERSION=4 PHP_EXTRA_VERSION="" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr $PHP_MAJOR_VERSION \* 10000 + $PHP_MINOR_VERSION \* 100 + $PHP_RELEASE_VERSION` @@ -3680,15 +3727,15 @@ fi if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then - as_fn_error "--with-shared-apache is not supported. Please refer to the documentation for using APXS" "$LINENO" 5 + as_fn_error $? "--with-shared-apache is not supported. Please refer to the documentation for using APXS" "$LINENO" 5 fi if test -n "$with_apache" && test -n "$with_apxs"; then - as_fn_error "--with-apache and --with-apxs cannot be used together" "$LINENO" 5 + as_fn_error $? "--with-apache and --with-apxs cannot be used together" "$LINENO" 5 fi if test -n "$with_apxs2filter" && test -n "$with_apxs2"; then - as_fn_error "--with-apxs2filter and --with-apxs2 cannot be used together" "$LINENO" 5 + as_fn_error $? "--with-apxs2filter and --with-apxs2 cannot be used together" "$LINENO" 5 fi @@ -3732,7 +3779,7 @@ if test -n "$ac_tool_prefix"; 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 @@ -3744,7 +3791,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3776,7 +3823,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 @@ -3788,7 +3835,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3828,8 +3875,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 @@ -3943,9 +3990,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; } @@ -3987,8 +4033,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 @@ -4045,9 +4091,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 @@ -4058,7 +4104,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 @@ -4098,8 +4144,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 @@ -4109,7 +4155,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 @@ -4146,7 +4192,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 @@ -4224,7 +4270,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 @@ -4233,8 +4279,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4332,7 +4377,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 @@ -4362,7 +4407,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. @@ -4378,11 +4423,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 @@ -4421,7 +4466,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. @@ -4437,18 +4482,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 @@ -4515,7 +4560,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; } fi set dummy $CC; ac_cc=`$as_echo "$2" | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4629,7 +4674,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 @@ -4659,7 +4704,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. @@ -4675,11 +4720,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 @@ -4718,7 +4763,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. @@ -4734,18 +4779,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 @@ -4756,7 +4801,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 @@ -4873,8 +4918,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 @@ -4886,7 +4930,7 @@ done ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" -if test "x$ac_cv_header_minix_config_h" = x""yes; then : +if test "x$ac_cv_header_minix_config_h" = xyes; then : MINIX=yes else MINIX= @@ -4908,14 +4952,14 @@ $as_echo "#define _MINIX 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : +if ${ac_cv_safe_to_define___extensions__+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -5008,7 +5052,7 @@ $as_echo "$ext_output" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -R" >&5 $as_echo_n "checking if compiler supports -R... " >&6; } -if test "${php_cv_cc_dashr+set}" = set; then : +if ${php_cv_cc_dashr+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5042,7 +5086,7 @@ if test $php_cv_cc_dashr = "yes"; then else { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -Wl,-rpath," >&5 $as_echo_n "checking if compiler supports -Wl,-rpath,... " >&6; } - if test "${php_cv_cc_rpath+set}" = set; then : + if ${php_cv_cc_rpath+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5089,7 +5133,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 @@ -5102,7 +5146,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5135,7 +5179,7 @@ $as_echo "$as_me: WARNING: mawk is known to have problems on some systems. You s *gawk) ;; bork) - as_fn_error "Could not find awk; Install GNU awk" "$LINENO" 5 + as_fn_error $? "Could not find awk; Install GNU awk" "$LINENO" 5 ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $AWK is broken" >&5 @@ -5143,7 +5187,7 @@ $as_echo_n "checking if $AWK is broken... " >&6; } if ! $AWK 'function foo() {}' >/dev/null 2>&1 ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - as_fn_error "You should install GNU awk" "$LINENO" 5 + as_fn_error $? "You should install GNU awk" "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -5161,7 +5205,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_YACC+set}" = set; then : +if ${ac_cv_prog_YACC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$YACC"; then @@ -5173,7 +5217,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_YACC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5209,7 +5253,7 @@ test -n "$YACC" || YACC="yacc" if test "$YACC"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bison version" >&5 $as_echo_n "checking for bison version... " >&6; } -if test "${php_cv_bison_version+set}" = set; then : +if ${php_cv_bison_version+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5248,7 +5292,7 @@ $as_echo "$as_me: WARNING: $bison_msg" >&2;} set dummy re2c; 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_RE2C+set}" = set; then : +if ${ac_cv_prog_RE2C+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$RE2C"; then @@ -5260,7 +5304,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RE2C="re2c" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5284,7 +5328,7 @@ fi if test -n "$RE2C"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for re2c version" >&5 $as_echo_n "checking for re2c version... " >&6; } -if test "${php_cv_re2c_version+set}" = set; then : +if ${php_cv_re2c_version+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5314,7 +5358,7 @@ $as_echo "$as_me: WARNING: You will need re2c 0.13.4 or later if you want to reg case $php_cv_bison_version in ""|invalid) if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" || ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then - as_fn_error "bison is required to build PHP/Zend when building a GIT checkout!" "$LINENO" 5 + as_fn_error $? "bison is required to build PHP/Zend when building a GIT checkout!" "$LINENO" 5 fi ;; esac @@ -5434,7 +5478,7 @@ case $host_alias in gcc_arg_name=ac_cv_gcc_arg_no_cpp_precomp { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -no-cpp-precomp" >&5 $as_echo_n "checking whether $CC supports -no-cpp-precomp... " >&6; } -if test "${ac_cv_gcc_arg_no_cpp_precomp+set}" = set; then : +if ${ac_cv_gcc_arg_no_cpp_precomp+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5772,7 +5816,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5 $as_echo_n "checking for pthreads_cflags... " >&6; } -if test "${ac_cv_pthreads_cflags+set}" = set; then : +if ${ac_cv_pthreads_cflags+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5838,7 +5882,7 @@ $as_echo "$ac_cv_pthreads_cflags" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5 $as_echo_n "checking for pthreads_lib... " >&6; } -if test "${ac_cv_pthreads_lib+set}" = set; then : +if ${ac_cv_pthreads_lib+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6009,15 +6053,15 @@ if test "$PHP_AOLSERVER" != "no"; then PHP_AOLSERVER_SRC=$PHP_AOLSERVER fi if test -z "$PHP_AOLSERVER_SRC" || test ! -d $PHP_AOLSERVER_SRC/include; then - as_fn_error "Please specify the path to the source distribution of AOLserver using --with-aolserver-src=DIR" "$LINENO" 5 + as_fn_error $? "Please specify the path to the source distribution of AOLserver using --with-aolserver-src=DIR" "$LINENO" 5 fi if test ! -d $PHP_AOLSERVER/bin ; then - as_fn_error "Please specify the path to the root of AOLserver using --with-aolserver=DIR" "$LINENO" 5 + as_fn_error $? "Please specify the path to the root of AOLserver using --with-aolserver=DIR" "$LINENO" 5 fi enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi @@ -6058,7 +6102,7 @@ $as_echo "#define HAVE_AOLSERVER 1" >>confdefs.h if test "shared" = "program"; then PHP_BINARIES="$PHP_BINARIES aolserver" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -6287,7 +6331,7 @@ $as_echo "3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs" { $as_echo "$as_me:${as_lineno-$LINENO}: result: The output of $APXS follows" >&5 $as_echo "The output of $APXS follows" >&6; } $APXS -q CFLAGS - as_fn_error "Aborting" "$LINENO" 5 + as_fn_error $? "Aborting" "$LINENO" 5 fi APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@" @@ -6308,7 +6352,7 @@ IFS="- /. APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6` if test "$APACHE_VERSION" -ge 2000000; then - as_fn_error "You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropriate switch --with-apxs2" "$LINENO" 5 + as_fn_error $? "You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropriate switch --with-apxs2" "$LINENO" 5 fi for flag in $APXS_CFLAGS; do @@ -6341,7 +6385,7 @@ IFS="- /. if test "$build_type" = "program"; then PHP_BINARIES="$PHP_BINARIES apache" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -6595,7 +6639,7 @@ $as_echo "#define HAVE_APACHE 1" >>confdefs.h if test "static" = "program"; then PHP_BINARIES="$PHP_BINARIES apache" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -6762,7 +6806,7 @@ $as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h fi # For Apache 2.0.x elif test -f $PHP_APACHE/include/httpd.h && test -f $PHP_APACHE/srclib/apr/include/apr_general.h ; then - as_fn_error "Use --with-apxs2 with Apache 2.x!" "$LINENO" 5 + as_fn_error $? "Use --with-apxs2 with Apache 2.x!" "$LINENO" 5 # For Apache 1.3.x elif test -f $PHP_APACHE/src/main/httpd.h; then APACHE_HAS_REGEX=1 @@ -6775,7 +6819,7 @@ $as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h if test "static" = "program"; then PHP_BINARIES="$PHP_BINARIES apache" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -6945,7 +6989,7 @@ $as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h $as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then - as_fn_error "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5 + as_fn_error $? "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5 fi elif test -f $PHP_APACHE/src/include/compat.h; then @@ -6964,7 +7008,7 @@ $as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h if test "static" = "program"; then PHP_BINARIES="$PHP_BINARIES apache" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -7134,7 +7178,7 @@ $as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h $as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then - as_fn_error "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5 + as_fn_error $? "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5 fi elif test -f $PHP_APACHE/src/include/compat.h; then @@ -7149,7 +7193,7 @@ $as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h if test "static" = "program"; then PHP_BINARIES="$PHP_BINARIES apache" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -7319,7 +7363,7 @@ $as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h $as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then - as_fn_error "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5 + as_fn_error $? "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5 fi elif test -f $PHP_APACHE/src/compat.h; then @@ -7329,7 +7373,7 @@ $as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "Invalid Apache directory - unable to find httpd.h under $PHP_APACHE" "$LINENO" 5 + as_fn_error $? "Invalid Apache directory - unable to find httpd.h under $PHP_APACHE" "$LINENO" 5 fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -7377,7 +7421,7 @@ if test "$APACHE_MODULE" = "yes"; then gcc_arg_name=ac_cv_gcc_arg_rdynamic { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -rdynamic" >&5 $as_echo_n "checking whether $CC supports -rdynamic... " >&6; } -if test "${ac_cv_gcc_arg_rdynamic+set}" = set; then : +if ${ac_cv_gcc_arg_rdynamic+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7420,7 +7464,7 @@ if test -n "$APACHE_INSTALL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for member fd in BUFF *" >&5 $as_echo_n "checking for member fd in BUFF *... " >&6; } -if test "${ac_cv_php_fd_in_buff+set}" = set; then : +if ${ac_cv_php_fd_in_buff+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7553,7 +7597,7 @@ $as_echo "" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: The output of $APXS follows:" >&5 $as_echo "The output of $APXS follows:" >&6; } $APXS -q CFLAGS - as_fn_error "Aborting" "$LINENO" 5 + as_fn_error $? "Aborting" "$LINENO" 5 fi APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` @@ -7592,9 +7636,9 @@ IFS="- /. APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6` if test "$APACHE_VERSION" -le 2000000; then - as_fn_error "You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)" "$LINENO" 5 + as_fn_error $? "You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)" "$LINENO" 5 elif test "$APACHE_VERSION" -lt 2000040; then - as_fn_error "Please note that Apache version >= 2.0.40 is required" "$LINENO" 5 + as_fn_error $? "Please note that Apache version >= 2.0.40 is required" "$LINENO" 5 fi APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` @@ -7618,7 +7662,7 @@ IFS="- /. if test "shared" = "program"; then PHP_BINARIES="$PHP_BINARIES apache2filter" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -7790,7 +7834,7 @@ EOF if test "bundle" = "program"; then PHP_BINARIES="$PHP_BINARIES apache2filter" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -7956,7 +8000,7 @@ EOF if test "shared" = "program"; then PHP_BINARIES="$PHP_BINARIES apache2filter" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -8118,7 +8162,7 @@ EOF if test "shared" = "program"; then PHP_BINARIES="$PHP_BINARIES apache2filter" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -8283,7 +8327,7 @@ EOF enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi fi @@ -8293,7 +8337,7 @@ EOF enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi fi @@ -8377,7 +8421,7 @@ $as_echo "" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: The output of $APXS follows:" >&5 $as_echo "The output of $APXS follows:" >&6; } $APXS -q CFLAGS - as_fn_error "Aborting" "$LINENO" 5 + as_fn_error $? "Aborting" "$LINENO" 5 fi APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` @@ -8416,9 +8460,9 @@ IFS="- /. APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6` if test "$APACHE_VERSION" -le 2000000; then - as_fn_error "You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)" "$LINENO" 5 + as_fn_error $? "You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)" "$LINENO" 5 elif test "$APACHE_VERSION" -lt 2000044; then - as_fn_error "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5 + as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5 fi APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` @@ -8442,7 +8486,7 @@ IFS="- /. if test "shared" = "program"; then PHP_BINARIES="$PHP_BINARIES apache2handler" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -8614,7 +8658,7 @@ EOF if test "bundle" = "program"; then PHP_BINARIES="$PHP_BINARIES apache2handler" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -8780,7 +8824,7 @@ EOF if test "shared" = "program"; then PHP_BINARIES="$PHP_BINARIES apache2handler" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -8942,7 +8986,7 @@ EOF if test "shared" = "program"; then PHP_BINARIES="$PHP_BINARIES apache2handler" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -9107,7 +9151,7 @@ EOF enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi fi @@ -9117,7 +9161,7 @@ EOF enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi fi @@ -9200,7 +9244,7 @@ $as_echo "3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs" { $as_echo "$as_me:${as_lineno-$LINENO}: result: The output of $APXS follows" >&5 $as_echo "The output of $APXS follows" >&6; } $APXS -q CFLAGS - as_fn_error "Aborting" "$LINENO" 5 + as_fn_error $? "Aborting" "$LINENO" 5 fi APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@" @@ -9221,7 +9265,7 @@ IFS="- /. APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6` if test "$APACHE_VERSION" -ge 2000000; then - as_fn_error "You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropriate switch --with-apxs2" "$LINENO" 5 + as_fn_error $? "You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropriate switch --with-apxs2" "$LINENO" 5 fi for flag in $APXS_CFLAGS; do @@ -9254,7 +9298,7 @@ IFS="- /. if test "$build_type" = "program"; then PHP_BINARIES="$PHP_BINARIES apache_hooks" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -9508,7 +9552,7 @@ $as_echo "#define HAVE_APACHE 1" >>confdefs.h if test "static" = "program"; then PHP_BINARIES="$PHP_BINARIES apache_hooks" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -9675,7 +9719,7 @@ $as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h fi # For Apache 2.0.x elif test -f $PHP_APACHE_HOOKS_STATIC/include/httpd.h && test -f $PHP_APACHE_HOOKS_STATIC/srclib/apr/include/apr_general.h ; then - as_fn_error "Use --with-apxs2 with Apache 2.x!" "$LINENO" 5 + as_fn_error $? "Use --with-apxs2 with Apache 2.x!" "$LINENO" 5 # For Apache 1.3.x elif test -f $PHP_APACHE_HOOKS_STATIC/src/main/httpd.h; then APACHE_HAS_REGEX=1 @@ -9688,7 +9732,7 @@ $as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h if test "static" = "program"; then PHP_BINARIES="$PHP_BINARIES apache_hooks" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -9858,7 +9902,7 @@ $as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h $as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then - as_fn_error "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5 + as_fn_error $? "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5 fi elif test -f $PHP_APACHE_HOOKS_STATIC/src/include/compat.h; then @@ -9877,7 +9921,7 @@ $as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h if test "static" = "program"; then PHP_BINARIES="$PHP_BINARIES apache_hooks" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -10047,7 +10091,7 @@ $as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h $as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then - as_fn_error "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5 + as_fn_error $? "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5 fi elif test -f $PHP_APACHE_HOOKS_STATIC/src/include/compat.h; then @@ -10062,7 +10106,7 @@ $as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h if test "static" = "program"; then PHP_BINARIES="$PHP_BINARIES apache_hooks" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -10232,7 +10276,7 @@ $as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h $as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then - as_fn_error "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5 + as_fn_error $? "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5 fi elif test -f $PHP_APACHE_HOOKS_STATIC/src/compat.h; then @@ -10242,7 +10286,7 @@ $as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "Invalid Apache directory - unable to find httpd.h under $PHP_APACHE_HOOKS_STATIC" "$LINENO" 5 + as_fn_error $? "Invalid Apache directory - unable to find httpd.h under $PHP_APACHE_HOOKS_STATIC" "$LINENO" 5 fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -10290,7 +10334,7 @@ if test "$APACHE_HOOKS_MODULE" = "yes"; then gcc_arg_name=ac_cv_gcc_arg_rdynamic { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -rdynamic" >&5 $as_echo_n "checking whether $CC supports -rdynamic... " >&6; } -if test "${ac_cv_gcc_arg_rdynamic+set}" = set; then : +if ${ac_cv_gcc_arg_rdynamic+:} false; then : $as_echo_n "(cached) " >&6 else @@ -10333,7 +10377,7 @@ if test -n "$APACHE_HOOKS_INSTALL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for member fd in BUFF *" >&5 $as_echo_n "checking for member fd in BUFF *... " >&6; } -if test "${ac_cv_php_fd_in_buff+set}" = set; then : +if ${ac_cv_php_fd_in_buff+:} false; then : $as_echo_n "(cached) " >&6 else @@ -10439,13 +10483,13 @@ if test "$PHP_CAUDIUM" != "no"; then elif test -f $PHP_CAUDIUM/bin/pike; then PIKE=$PHP_CAUDIUM/bin/pike else - as_fn_error "Could not find a pike in $PHP_CAUDIUM/bin/" "$LINENO" 5 + as_fn_error $? "Could not find a pike in $PHP_CAUDIUM/bin/" "$LINENO" 5 fi if $PIKE -e 'float v; int rel;sscanf(version(), "Pike v%f release %d", v, rel);v += rel/10000.0; if(v < 7.0268) exit(1); exit(0);'; then PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'` PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,' ` if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then - as_fn_error "Failed to figure out Pike module and include directories" "$LINENO" 5 + as_fn_error $? "Failed to figure out Pike module and include directories" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -10560,7 +10604,7 @@ $as_echo "version mismatch" >&6; } $as_echo "not found" >&6; } fi else - as_fn_error "Caudium PHP5 requires Pike 7.0 or newer" "$LINENO" 5 + as_fn_error $? "Caudium PHP5 requires Pike 7.0 or newer" "$LINENO" 5 fi PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` @@ -10570,7 +10614,7 @@ $as_echo "#define HAVE_CAUDIUM 1" >>confdefs.h if test "shared" = "program"; then PHP_BINARIES="$PHP_BINARIES caudium" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -10732,7 +10776,7 @@ EOF enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi fi @@ -10765,7 +10809,7 @@ ext_output=$PHP_CLI for ac_func in setproctitle do : 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 : cat >>confdefs.h <<_ACEOF #define HAVE_SETPROCTITLE 1 _ACEOF @@ -10777,7 +10821,7 @@ done for ac_header in sys/pstat.h do : ac_fn_c_check_header_mongrel "$LINENO" "sys/pstat.h" "ac_cv_header_sys_pstat_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_pstat_h" = x""yes; then : +if test "x$ac_cv_header_sys_pstat_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SYS_PSTAT_H 1 _ACEOF @@ -10789,7 +10833,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5 $as_echo_n "checking for PS_STRINGS... " >&6; } -if test "${cli_cv_var_PS_STRINGS+set}" = set; then : +if ${cli_cv_var_PS_STRINGS+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10838,7 +10882,7 @@ if test "$PHP_CLI" != "no"; then if test "program" = "program"; then PHP_BINARIES="$PHP_BINARIES cli" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -11014,7 +11058,7 @@ $as_echo "$ext_output" >&6; } if test "$PHP_CONTINUITY" != "no"; then if test ! -d $PHP_CONTINUITY; then - as_fn_error "Please specify the path to the root of your Continuity server using --with-continuity=DIR" "$LINENO" 5 + as_fn_error $? "Please specify the path to the root of your Continuity server using --with-continuity=DIR" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Continuity include files" >&5 $as_echo_n "checking for Continuity include files... " >&6; } @@ -11023,14 +11067,14 @@ $as_echo_n "checking for Continuity include files... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: Continuity Binary Distribution" >&5 $as_echo "Continuity Binary Distribution" >&6; } else - as_fn_error "Cannot find your CAPI include files in either DIR/src or DIR/include" "$LINENO" 5 + as_fn_error $? "Cannot find your CAPI include files in either DIR/src or DIR/include" "$LINENO" 5 fi if test "shared" = "program"; then PHP_BINARIES="$PHP_BINARIES continuity" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -11219,7 +11263,7 @@ EOF enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi @@ -11273,7 +11317,7 @@ if test "$PHP_EMBED" != "no"; then if test "$PHP_EMBED_TYPE" = "program"; then PHP_BINARIES="$PHP_BINARIES embed" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -11517,8 +11561,7 @@ $as_echo "$PHP_FPM" >&6; } 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 @@ -11529,7 +11572,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 $as_echo_n "checking for library containing socket... " >&6; } -if test "${ac_cv_search_socket+set}" = set; then : +if ${ac_cv_search_socket+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -11563,11 +11606,11 @@ for ac_lib in '' socket; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_socket+set}" = set; then : + if ${ac_cv_search_socket+:} false; then : break fi done -if test "${ac_cv_search_socket+set}" = set; then : +if ${ac_cv_search_socket+:} false; then : else ac_cv_search_socket=no @@ -11585,7 +11628,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_addr" >&5 $as_echo_n "checking for library containing inet_addr... " >&6; } -if test "${ac_cv_search_inet_addr+set}" = set; then : +if ${ac_cv_search_inet_addr+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -11619,11 +11662,11 @@ for ac_lib in '' nsl; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_inet_addr+set}" = set; then : + if ${ac_cv_search_inet_addr+:} false; then : break fi done -if test "${ac_cv_search_inet_addr+set}" = set; then : +if ${ac_cv_search_inet_addr+:} false; then : else ac_cv_search_inet_addr=no @@ -11644,8 +11687,7 @@ fi 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 @@ -11658,8 +11700,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 @@ -11672,8 +11713,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 @@ -11685,7 +11725,7 @@ done for ac_header in sysexits.h do : ac_fn_c_check_header_mongrel "$LINENO" "sysexits.h" "ac_cv_header_sysexits_h" "$ac_includes_default" -if test "x$ac_cv_header_sysexits_h" = x""yes; then : +if test "x$ac_cv_header_sysexits_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SYSEXITS_H 1 _ACEOF @@ -11808,8 +11848,8 @@ $as_echo_n "checking for clock_get_time... " >&6; } if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12641,7 +12681,7 @@ ext_output=$PHP_FPM_SYSTEMD if test "$PHP_FPM_SYSTEMD" != "no" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sd_notify in -lsystemd-daemon" >&5 $as_echo_n "checking for sd_notify in -lsystemd-daemon... " >&6; } -if test "${ac_cv_lib_systemd_daemon_sd_notify+set}" = set; then : +if ${ac_cv_lib_systemd_daemon_sd_notify+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -12675,14 +12715,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_daemon_sd_notify" >&5 $as_echo "$ac_cv_lib_systemd_daemon_sd_notify" >&6; } -if test "x$ac_cv_lib_systemd_daemon_sd_notify" = x""yes; then : +if test "x$ac_cv_lib_systemd_daemon_sd_notify" = xyes; then : SYSTEMD_LIBS="-lsystemd-daemon" fi for ac_header in systemd/sd-daemon.h do : ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default" -if test "x$ac_cv_header_systemd_sd_daemon_h" = x""yes; then : +if test "x$ac_cv_header_systemd_sd_daemon_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SYSTEMD_SD_DAEMON_H 1 _ACEOF @@ -12694,7 +12734,7 @@ fi done if test $HAVE_SD_DAEMON_H = "no" || test -z "${SYSTEMD_LIBS}"; then - as_fn_error "Your system does not support systemd." "$LINENO" 5 + as_fn_error $? "Your system does not support systemd." "$LINENO" 5 else $as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h @@ -12847,7 +12887,7 @@ _ACEOF if test "program" = "program"; then PHP_BINARIES="$PHP_BINARIES fpm" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -12994,11 +13034,11 @@ if test "$PHP_ISAPI" != "no"; then else ZEUSPATH=$PHP_ISAPI fi - test -f "$ZEUSPATH/web/include/httpext.h" || as_fn_error "Unable to find httpext.h in $ZEUSPATH/web/include" "$LINENO" 5 + test -f "$ZEUSPATH/web/include/httpext.h" || as_fn_error $? "Unable to find httpext.h in $ZEUSPATH/web/include" "$LINENO" 5 enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi @@ -13039,7 +13079,7 @@ $as_echo "#define WITH_ZEUS 1" >>confdefs.h if test "shared" = "program"; then PHP_BINARIES="$PHP_BINARIES isapi" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -13257,7 +13297,7 @@ if test "$PHP_LITESPEED" != "no"; then if test "program" = "program"; then PHP_BINARIES="$PHP_BINARIES litespeed" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -13405,7 +13445,7 @@ if test "$PHP_MILTER" != "no"; then if test -f /usr/lib/libmilter/libmilter.a ; then MILTERPATH=/usr/lib/libmilter else - as_fn_error "Unable to find libmilter.a" "$LINENO" 5 + as_fn_error $? "Unable to find libmilter.a" "$LINENO" 5 fi fi else @@ -13416,7 +13456,7 @@ if test "$PHP_MILTER" != "no"; then enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi @@ -13429,7 +13469,7 @@ if test "$PHP_MILTER" != "no"; then if test "program" = "program"; then PHP_BINARIES="$PHP_BINARIES milter" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -13605,7 +13645,7 @@ $as_echo "$ext_output" >&6; } if test "$PHP_NSAPI" != "no"; then if test ! -d $PHP_NSAPI/bin ; then - as_fn_error "Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" "$LINENO" 5 + as_fn_error $? "Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSAPI include files" >&5 $as_echo_n "checking for NSAPI include files... " >&6; } @@ -13617,8 +13657,7 @@ $as_echo "Netscape 3.x / Sun 7.x style" >&6; } 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 @@ -13637,8 +13676,7 @@ $as_echo "iPlanet 4.x / Sun 6.x style" >&6; } 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 @@ -13650,7 +13688,7 @@ done NSAPI_INCLUDE="$NSAPI_INCLUDE -I$NSAPI_INC_DIR" fi if test -z "$NSAPI_INCLUDE"; then - as_fn_error "Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include" "$LINENO" 5 + as_fn_error $? "Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include" "$LINENO" 5 fi @@ -13696,7 +13734,7 @@ done enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi @@ -13706,7 +13744,7 @@ $as_echo "#define HAVE_NSAPI 1" >>confdefs.h if test "shared" = "program"; then PHP_BINARIES="$PHP_BINARIES nsapi" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -13893,12 +13931,12 @@ $as_echo "$ext_output" >&6; } if test "$PHP_PHTTPD" != "no"; then if test ! -d $PHP_PHTTPD ; then - as_fn_error "You did not specify a directory" "$LINENO" 5 + as_fn_error $? "You did not specify a directory" "$LINENO" 5 fi enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi @@ -13939,7 +13977,7 @@ $as_echo "#define HAVE_PHTTPD 1" >>confdefs.h if test "shared" = "program"; then PHP_BINARIES="$PHP_BINARIES phttpd" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -14129,11 +14167,11 @@ if test "$PHP_PI3WEB" != "no"; then else PI3PATH=$PHP_PI3WEB fi - test -f "$PI3PATH/PiAPI/PiAPI.h" || as_fn_error "Unable to find PiAPI.h in $PI3PATH/PiAPI" "$LINENO" 5 + test -f "$PI3PATH/PiAPI/PiAPI.h" || as_fn_error $? "Unable to find PiAPI.h in $PI3PATH/PiAPI" "$LINENO" 5 enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi @@ -14267,7 +14305,7 @@ $as_echo "#define WITH_PI3WEB 1" >>confdefs.h if test "shared" = "program"; then PHP_BINARIES="$PHP_BINARIES pi3web" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -14477,24 +14515,24 @@ RESULT= $as_echo_n "checking for Roxen/Pike support... " >&6; } if test "$PHP_ROXEN" != "no"; then if test ! -d $PHP_ROXEN ; then - as_fn_error "You did not specify a directory" "$LINENO" 5 + as_fn_error $? "You did not specify a directory" "$LINENO" 5 fi if test -f $PHP_ROXEN/bin/roxen; then PIKE=$PHP_ROXEN/bin/roxen elif test -f $PHP_ROXEN/bin/pike; then PIKE=$PHP_ROXEN/bin/pike else - as_fn_error "Could not find a pike in $PHP_ROXEN/bin/" "$LINENO" 5 + as_fn_error $? "Could not find a pike in $PHP_ROXEN/bin/" "$LINENO" 5 fi if $PIKE -e 'float v; catch(v = __VERSION__ + (__BUILD__/10000.0)); if(v < 0.7079) exit(1); exit(0);'; then PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'` PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,'` if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then - as_fn_error "Failed to figure out Pike module and include directories" "$LINENO" 5 + as_fn_error $? "Failed to figure out Pike module and include directories" "$LINENO" 5 fi else - as_fn_error "Roxen/PHP requires Pike 0.7.79 or newer" "$LINENO" 5 + as_fn_error $? "Roxen/PHP requires Pike 0.7.79 or newer" "$LINENO" 5 fi @@ -14535,7 +14573,7 @@ $as_echo "#define HAVE_ROXEN 1" >>confdefs.h if test "shared" = "program"; then PHP_BINARIES="$PHP_BINARIES roxen" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -14701,7 +14739,7 @@ EOF enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi @@ -14764,7 +14802,7 @@ $as_echo "thttpd directory does not exist ($PHP_THTTPD)" >&6; } elif grep Premium $PHP_THTTPD/version.h >/dev/null; then patch= else - as_fn_error "This version only supports thttpd-2.21b and Premium thttpd" "$LINENO" 5 + as_fn_error $? "This version only supports thttpd-2.21b and Premium thttpd" "$LINENO" 5 fi if test -n "$GCC"; then @@ -14772,7 +14810,7 @@ $as_echo "thttpd directory does not exist ($PHP_THTTPD)" >&6; } gcc_arg_name=ac_cv_gcc_arg_rdynamic { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -rdynamic" >&5 $as_echo_n "checking whether $CC supports -rdynamic... " >&6; } -if test "${ac_cv_gcc_arg_rdynamic+set}" = set; then : +if ${ac_cv_gcc_arg_rdynamic+:} false; then : $as_echo_n "(cached) " >&6 else @@ -14845,7 +14883,7 @@ $as_echo "$ac_cv_gcc_arg_rdynamic" >&6; } if test "static" = "program"; then PHP_BINARIES="$PHP_BINARIES thttpd" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -14992,13 +15030,13 @@ if test "$PHP_TUX" != "no"; then for ac_header in tuxmodule.h do : ac_fn_c_check_header_mongrel "$LINENO" "tuxmodule.h" "ac_cv_header_tuxmodule_h" "$ac_includes_default" -if test "x$ac_cv_header_tuxmodule_h" = x""yes; then : +if test "x$ac_cv_header_tuxmodule_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_TUXMODULE_H 1 _ACEOF : else - as_fn_error "Cannot find tuxmodule.h" "$LINENO" 5 + as_fn_error $? "Cannot find tuxmodule.h" "$LINENO" 5 fi done @@ -15007,7 +15045,7 @@ done if test "shared" = "program"; then PHP_BINARIES="$PHP_BINARIES tux" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -15246,7 +15284,7 @@ if test "$PHP_WEBJAMES" != "no"; then if test "static" = "program"; then PHP_BINARIES="$PHP_BINARIES webjames" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -15513,7 +15551,7 @@ $as_echo "no" >&6; } if test "program" = "program"; then PHP_BINARIES="$PHP_BINARIES cgi" elif test "$PHP_SAPI" != "none"; then - as_fn_error " + as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | @@ -15654,7 +15692,7 @@ $as_echo "none" >&6; } fi if test -z "$PHP_INSTALLED_SAPIS"; then - as_fn_error "Nothing to build." "$LINENO" 5 + as_fn_error $? "Nothing to build." "$LINENO" 5 fi if test "$enable_maintainer_zts" = "yes"; then @@ -15672,7 +15710,7 @@ fi host_alias=$host fi if test -z "$host_alias"; then - as_fn_error "host_alias is not set. Make sure to run config.guess" "$LINENO" 5 + as_fn_error $? "host_alias is not set. Make sure to run config.guess" "$LINENO" 5 fi case $host_alias in *solaris*) @@ -15711,7 +15749,7 @@ $as_echo "${T_MD}Running system checks${T_ME}" >&6; } set dummy sendmail; 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_PROG_SENDMAIL+set}" = set; then : +if ${ac_cv_path_PROG_SENDMAIL+:} false; then : $as_echo_n "(cached) " >&6 else case $PROG_SENDMAIL in @@ -15726,7 +15764,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PROG_SENDMAIL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15756,7 +15794,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system uses EBCDIC" >&5 $as_echo_n "checking whether system uses EBCDIC... " >&6; } -if test "${ac_cv_ebcdic+set}" = set; then : +if ${ac_cv_ebcdic+:} false; then : $as_echo_n "(cached) " >&6 else @@ -15798,7 +15836,7 @@ $as_echo "#define CHARSET_EBCDIC 1" >>confdefs.h { $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_php+set}" = set; then : +if ${ac_cv_c_bigendian_php+:} false; then : $as_echo_n "(cached) " >&6 else @@ -15845,7 +15883,7 @@ $as_echo "#define WORDS_BIGENDIAN /**/" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether writing to stdout works" >&5 $as_echo_n "checking whether writing to stdout works... " >&6; } -if test "${ac_cv_write_stdout+set}" = set; then : +if ${ac_cv_write_stdout+:} false; then : $as_echo_n "(cached) " >&6 else @@ -15943,11 +15981,11 @@ test -d /usr/ucblib && unset found 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 : found=yes else 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 : found=yes else found=no @@ -15971,7 +16009,7 @@ $as_echo "#define HAVE_SOCKET 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 $as_echo_n "checking for socket in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_socket+set}" = set; then : +if ${ac_cv_lib_socket_socket+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16005,13 +16043,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 $as_echo "$ac_cv_lib_socket_socket" >&6; } -if test "x$ac_cv_lib_socket_socket" = x""yes; then : +if test "x$ac_cv_lib_socket_socket" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socket in -lsocket" >&5 $as_echo_n "checking for __socket in -lsocket... " >&6; } -if test "${ac_cv_lib_socket___socket+set}" = set; then : +if ${ac_cv_lib_socket___socket+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16045,7 +16083,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socket" >&5 $as_echo "$ac_cv_lib_socket___socket" >&6; } -if test "x$ac_cv_lib_socket___socket" = x""yes; then : +if test "x$ac_cv_lib_socket___socket" = xyes; then : found=yes else found=no @@ -16111,11 +16149,11 @@ $as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h unset found ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair" -if test "x$ac_cv_func_socketpair" = x""yes; then : +if test "x$ac_cv_func_socketpair" = xyes; then : found=yes else ac_fn_c_check_func "$LINENO" "__socketpair" "ac_cv_func___socketpair" -if test "x$ac_cv_func___socketpair" = x""yes; then : +if test "x$ac_cv_func___socketpair" = xyes; then : found=yes else found=no @@ -16139,7 +16177,7 @@ $as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lsocket" >&5 $as_echo_n "checking for socketpair in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_socketpair+set}" = set; then : +if ${ac_cv_lib_socket_socketpair+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16173,13 +16211,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socketpair" >&5 $as_echo "$ac_cv_lib_socket_socketpair" >&6; } -if test "x$ac_cv_lib_socket_socketpair" = x""yes; then : +if test "x$ac_cv_lib_socket_socketpair" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socketpair in -lsocket" >&5 $as_echo_n "checking for __socketpair in -lsocket... " >&6; } -if test "${ac_cv_lib_socket___socketpair+set}" = set; then : +if ${ac_cv_lib_socket___socketpair+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16213,7 +16251,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socketpair" >&5 $as_echo "$ac_cv_lib_socket___socketpair" >&6; } -if test "x$ac_cv_lib_socket___socketpair" = x""yes; then : +if test "x$ac_cv_lib_socket___socketpair" = xyes; then : found=yes else found=no @@ -16279,11 +16317,11 @@ $as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h unset found ac_fn_c_check_func "$LINENO" "htonl" "ac_cv_func_htonl" -if test "x$ac_cv_func_htonl" = x""yes; then : +if test "x$ac_cv_func_htonl" = xyes; then : found=yes else ac_fn_c_check_func "$LINENO" "__htonl" "ac_cv_func___htonl" -if test "x$ac_cv_func___htonl" = x""yes; then : +if test "x$ac_cv_func___htonl" = xyes; then : found=yes else found=no @@ -16307,7 +16345,7 @@ $as_echo "#define HAVE_HTONL 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htonl in -lsocket" >&5 $as_echo_n "checking for htonl in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_htonl+set}" = set; then : +if ${ac_cv_lib_socket_htonl+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16341,13 +16379,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_htonl" >&5 $as_echo "$ac_cv_lib_socket_htonl" >&6; } -if test "x$ac_cv_lib_socket_htonl" = x""yes; then : +if test "x$ac_cv_lib_socket_htonl" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __htonl in -lsocket" >&5 $as_echo_n "checking for __htonl in -lsocket... " >&6; } -if test "${ac_cv_lib_socket___htonl+set}" = set; then : +if ${ac_cv_lib_socket___htonl+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16381,7 +16419,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___htonl" >&5 $as_echo "$ac_cv_lib_socket___htonl" >&6; } -if test "x$ac_cv_lib_socket___htonl" = x""yes; then : +if test "x$ac_cv_lib_socket___htonl" = xyes; then : found=yes else found=no @@ -16447,11 +16485,11 @@ $as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h unset found ac_fn_c_check_func "$LINENO" "gethostname" "ac_cv_func_gethostname" -if test "x$ac_cv_func_gethostname" = x""yes; then : +if test "x$ac_cv_func_gethostname" = xyes; then : found=yes else ac_fn_c_check_func "$LINENO" "__gethostname" "ac_cv_func___gethostname" -if test "x$ac_cv_func___gethostname" = x""yes; then : +if test "x$ac_cv_func___gethostname" = xyes; then : found=yes else found=no @@ -16475,7 +16513,7 @@ $as_echo "#define HAVE_GETHOSTNAME 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostname in -lnsl" >&5 $as_echo_n "checking for gethostname in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_gethostname+set}" = set; then : +if ${ac_cv_lib_nsl_gethostname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16509,13 +16547,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostname" >&5 $as_echo "$ac_cv_lib_nsl_gethostname" >&6; } -if test "x$ac_cv_lib_nsl_gethostname" = x""yes; then : +if test "x$ac_cv_lib_nsl_gethostname" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostname in -lnsl" >&5 $as_echo_n "checking for __gethostname in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl___gethostname+set}" = set; then : +if ${ac_cv_lib_nsl___gethostname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16549,7 +16587,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostname" >&5 $as_echo "$ac_cv_lib_nsl___gethostname" >&6; } -if test "x$ac_cv_lib_nsl___gethostname" = x""yes; then : +if test "x$ac_cv_lib_nsl___gethostname" = xyes; then : found=yes else found=no @@ -16615,11 +16653,11 @@ $as_echo "#define HAVE_LIBNSL 1" >>confdefs.h unset found ac_fn_c_check_func "$LINENO" "gethostbyaddr" "ac_cv_func_gethostbyaddr" -if test "x$ac_cv_func_gethostbyaddr" = x""yes; then : +if test "x$ac_cv_func_gethostbyaddr" = xyes; then : found=yes else ac_fn_c_check_func "$LINENO" "__gethostbyaddr" "ac_cv_func___gethostbyaddr" -if test "x$ac_cv_func___gethostbyaddr" = x""yes; then : +if test "x$ac_cv_func___gethostbyaddr" = xyes; then : found=yes else found=no @@ -16643,7 +16681,7 @@ $as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnsl" >&5 $as_echo_n "checking for gethostbyaddr in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_gethostbyaddr+set}" = set; then : +if ${ac_cv_lib_nsl_gethostbyaddr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16677,13 +16715,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyaddr" >&5 $as_echo "$ac_cv_lib_nsl_gethostbyaddr" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyaddr" = x""yes; then : +if test "x$ac_cv_lib_nsl_gethostbyaddr" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostbyaddr in -lnsl" >&5 $as_echo_n "checking for __gethostbyaddr in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl___gethostbyaddr+set}" = set; then : +if ${ac_cv_lib_nsl___gethostbyaddr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16717,7 +16755,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostbyaddr" >&5 $as_echo "$ac_cv_lib_nsl___gethostbyaddr" >&6; } -if test "x$ac_cv_lib_nsl___gethostbyaddr" = x""yes; then : +if test "x$ac_cv_lib_nsl___gethostbyaddr" = xyes; then : found=yes else found=no @@ -16783,11 +16821,11 @@ $as_echo "#define HAVE_LIBNSL 1" >>confdefs.h unset found ac_fn_c_check_func "$LINENO" "yp_get_default_domain" "ac_cv_func_yp_get_default_domain" -if test "x$ac_cv_func_yp_get_default_domain" = x""yes; then : +if test "x$ac_cv_func_yp_get_default_domain" = xyes; then : found=yes else ac_fn_c_check_func "$LINENO" "__yp_get_default_domain" "ac_cv_func___yp_get_default_domain" -if test "x$ac_cv_func___yp_get_default_domain" = x""yes; then : +if test "x$ac_cv_func___yp_get_default_domain" = xyes; then : found=yes else found=no @@ -16811,7 +16849,7 @@ $as_echo "#define HAVE_YP_GET_DEFAULT_DOMAIN 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yp_get_default_domain in -lnsl" >&5 $as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then : +if ${ac_cv_lib_nsl_yp_get_default_domain+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16845,13 +16883,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5 $as_echo "$ac_cv_lib_nsl_yp_get_default_domain" >&6; } -if test "x$ac_cv_lib_nsl_yp_get_default_domain" = x""yes; then : +if test "x$ac_cv_lib_nsl_yp_get_default_domain" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __yp_get_default_domain in -lnsl" >&5 $as_echo_n "checking for __yp_get_default_domain in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl___yp_get_default_domain+set}" = set; then : +if ${ac_cv_lib_nsl___yp_get_default_domain+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16885,7 +16923,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___yp_get_default_domain" >&5 $as_echo "$ac_cv_lib_nsl___yp_get_default_domain" >&6; } -if test "x$ac_cv_lib_nsl___yp_get_default_domain" = x""yes; then : +if test "x$ac_cv_lib_nsl___yp_get_default_domain" = xyes; then : found=yes else found=no @@ -16952,11 +16990,11 @@ $as_echo "#define HAVE_LIBNSL 1" >>confdefs.h unset found 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 : found=yes 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 : found=yes else found=no @@ -16980,7 +17018,7 @@ $as_echo "#define HAVE_DLOPEN 1" >>confdefs.h unset found { $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 @@ -17014,13 +17052,13 @@ 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 : found=yes 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 @@ -17054,7 +17092,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 : found=yes else found=no @@ -17121,7 +17159,7 @@ $as_echo "#define HAVE_LIBDL 1" >>confdefs.h fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5 $as_echo_n "checking for sin in -lm... " >&6; } -if test "${ac_cv_lib_m_sin+set}" = set; then : +if ${ac_cv_lib_m_sin+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17155,7 +17193,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5 $as_echo "$ac_cv_lib_m_sin" >&6; } -if test "x$ac_cv_lib_m_sin" = x""yes; then : +if test "x$ac_cv_lib_m_sin" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBM 1 _ACEOF @@ -17171,11 +17209,11 @@ fi unset found ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton" -if test "x$ac_cv_func_inet_aton" = x""yes; then : +if test "x$ac_cv_func_inet_aton" = xyes; then : found=yes else ac_fn_c_check_func "$LINENO" "__inet_aton" "ac_cv_func___inet_aton" -if test "x$ac_cv_func___inet_aton" = x""yes; then : +if test "x$ac_cv_func___inet_aton" = xyes; then : found=yes else found=no @@ -17199,7 +17237,7 @@ $as_echo "#define HAVE_INET_ATON 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5 $as_echo_n "checking for inet_aton in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then : +if ${ac_cv_lib_resolv_inet_aton+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17233,13 +17271,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5 $as_echo "$ac_cv_lib_resolv_inet_aton" >&6; } -if test "x$ac_cv_lib_resolv_inet_aton" = x""yes; then : +if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __inet_aton in -lresolv" >&5 $as_echo_n "checking for __inet_aton in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv___inet_aton+set}" = set; then : +if ${ac_cv_lib_resolv___inet_aton+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17273,7 +17311,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___inet_aton" >&5 $as_echo "$ac_cv_lib_resolv___inet_aton" >&6; } -if test "x$ac_cv_lib_resolv___inet_aton" = x""yes; then : +if test "x$ac_cv_lib_resolv___inet_aton" = xyes; then : found=yes else found=no @@ -17331,7 +17369,7 @@ $as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lbind" >&5 $as_echo_n "checking for inet_aton in -lbind... " >&6; } -if test "${ac_cv_lib_bind_inet_aton+set}" = set; then : +if ${ac_cv_lib_bind_inet_aton+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17365,13 +17403,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_inet_aton" >&5 $as_echo "$ac_cv_lib_bind_inet_aton" >&6; } -if test "x$ac_cv_lib_bind_inet_aton" = x""yes; then : +if test "x$ac_cv_lib_bind_inet_aton" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __inet_aton in -lbind" >&5 $as_echo_n "checking for __inet_aton in -lbind... " >&6; } -if test "${ac_cv_lib_bind___inet_aton+set}" = set; then : +if ${ac_cv_lib_bind___inet_aton+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17405,7 +17443,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___inet_aton" >&5 $as_echo "$ac_cv_lib_bind___inet_aton" >&6; } -if test "x$ac_cv_lib_bind___inet_aton" = x""yes; then : +if test "x$ac_cv_lib_bind___inet_aton" = xyes; then : found=yes else found=no @@ -17472,7 +17510,7 @@ $as_echo "#define HAVE_LIBBIND 1" >>confdefs.h { $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 @@ -17587,7 +17625,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 @@ -17614,8 +17652,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 @@ -17628,7 +17665,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 @@ -17662,11 +17699,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 @@ -17685,7 +17722,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 @@ -17719,11 +17756,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 @@ -17818,8 +17855,7 @@ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " #endif " -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 @@ -17831,7 +17867,7 @@ done ac_fn_c_check_func "$LINENO" "fopencookie" "ac_cv_func_fopencookie" -if test "x$ac_cv_func_fopencookie" = x""yes; then : +if test "x$ac_cv_func_fopencookie" = xyes; then : have_glibc_fopencookie=yes fi @@ -17973,7 +18009,7 @@ $as_echo "no" >&6; };; { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken libc stdio" >&5 $as_echo_n "checking for broken libc stdio... " >&6; } - if test "${_cv_have_broken_glibc_fopen_append+set}" = set; then : + if ${_cv_have_broken_glibc_fopen_append+:} false; then : $as_echo_n "(cached) " >&6 else @@ -18058,7 +18094,7 @@ $as_echo "no" >&6; } { $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 @@ -18095,7 +18131,7 @@ ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_ #include <$ac_cv_struct_tm> " -if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then : +if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_TM_TM_ZONE 1 @@ -18111,7 +18147,7 @@ $as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h else ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h> " -if test "x$ac_cv_have_decl_tzname" = x""yes; then : +if test "x$ac_cv_have_decl_tzname" = xyes; then : ac_have_decl=1 else ac_have_decl=0 @@ -18123,7 +18159,7 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 $as_echo_n "checking for tzname... " >&6; } -if test "${ac_cv_var_tzname+set}" = set; then : +if ${ac_cv_var_tzname+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18317,7 +18353,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff in struct tm" >&5 $as_echo_n "checking for tm_gmtoff in struct tm... " >&6; } -if test "${ac_cv_struct_tm_gmtoff+set}" = set; then : +if ${ac_cv_struct_tm_gmtoff+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18351,7 +18387,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct flock" >&5 $as_echo_n "checking for struct flock... " >&6; } -if test "${ac_cv_struct_flock+set}" = set; then : +if ${ac_cv_struct_flock+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18391,7 +18427,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5 $as_echo_n "checking for socklen_t... " >&6; } -if test "${ac_cv_socklen_t+set}" = set; then : +if ${ac_cv_socklen_t+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18436,7 +18472,7 @@ fi # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 $as_echo_n "checking size of size_t... " >&6; } -if test "${ac_cv_sizeof_size_t+set}" = set; then : +if ${ac_cv_sizeof_size_t+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then : @@ -18445,9 +18481,8 @@ else if test "$ac_cv_type_size_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 (size_t) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (size_t) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_size_t=0 fi @@ -18470,7 +18505,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 : @@ -18479,9 +18514,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 @@ -18504,7 +18538,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long int" >&5 $as_echo_n "checking size of long long int... " >&6; } -if test "${ac_cv_sizeof_long_long_int+set}" = set; then : +if ${ac_cv_sizeof_long_long_int+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long int))" "ac_cv_sizeof_long_long_int" "$ac_includes_default"; then : @@ -18513,9 +18547,8 @@ else if test "$ac_cv_type_long_long_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 (long long int) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (long long int) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_long_int=0 fi @@ -18538,7 +18571,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 : @@ -18547,9 +18580,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 @@ -18572,7 +18604,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 : @@ -18581,9 +18613,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 @@ -18606,7 +18637,7 @@ _ACEOF $as_echo_n "checking size of intmax_t... " >&6; } php_cache_value=php_cv_sizeof_intmax_t - if test "${php_cv_sizeof_intmax_t+set}" = set; then : + if ${php_cv_sizeof_intmax_t+:} false; then : $as_echo_n "(cached) " >&6 else @@ -18685,7 +18716,7 @@ $as_echo "$php_cv_sizeof_intmax_t" >&6; } $as_echo_n "checking size of ssize_t... " >&6; } php_cache_value=php_cv_sizeof_ssize_t - if test "${php_cv_sizeof_ssize_t+set}" = set; then : + if ${php_cv_sizeof_ssize_t+:} false; then : $as_echo_n "(cached) " >&6 else @@ -18764,7 +18795,7 @@ $as_echo "$php_cv_sizeof_ssize_t" >&6; } $as_echo_n "checking size of ptrdiff_t... " >&6; } php_cache_value=php_cv_sizeof_ptrdiff_t - if test "${php_cv_sizeof_ptrdiff_t+set}" = set; then : + if ${php_cv_sizeof_ptrdiff_t+:} false; then : $as_echo_n "(cached) " >&6 else @@ -18840,7 +18871,7 @@ $as_echo "$php_cv_sizeof_ptrdiff_t" >&6; } 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 @@ -18854,7 +18885,7 @@ fi if test "`uname -s 2>/dev/null`" != "QNX"; then ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default" -if test "x$ac_cv_member_struct_stat_st_blocks" = x""yes; then : +if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_BLOCKS 1 @@ -18879,7 +18910,7 @@ $as_echo "$as_me: WARNING: warnings level for cc set to 0" >&2;} WARNING_LEVEL=0 fi ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default" -if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then : +if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_RDEV 1 @@ -18893,7 +18924,7 @@ 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 @@ -18905,7 +18936,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 @@ -18937,7 +18968,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5 $as_echo_n "checking for struct sockaddr_storage... " >&6; } -if test "${ac_cv_sockaddr_storage+set}" = set; then : +if ${ac_cv_sockaddr_storage+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18969,7 +19000,7 @@ $as_echo "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for field sa_len in struct sockaddr" >&5 $as_echo_n "checking for field sa_len in struct sockaddr... " >&6; } -if test "${ac_cv_sockaddr_sa_len+set}" = set; then : +if ${ac_cv_sockaddr_sa_len+:} false; then : $as_echo_n "(cached) " >&6 else @@ -19004,7 +19035,7 @@ $as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPv6 support" >&5 $as_echo_n "checking for IPv6 support... " >&6; } -if test "${ac_cv_ipv6_support+set}" = set; then : +if ${ac_cv_ipv6_support+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19035,13 +19066,13 @@ $as_echo "$ac_cv_ipv6_support" >&6; } 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 @@ -19137,8 +19168,7 @@ nanosleep \ 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 @@ -19154,7 +19184,7 @@ done unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5 $as_echo_n "checking for nanosleep in -lrt... " >&6; } -if test "${ac_cv_lib_rt_nanosleep+set}" = set; then : +if ${ac_cv_lib_rt_nanosleep+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19188,13 +19218,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_nanosleep" >&5 $as_echo "$ac_cv_lib_rt_nanosleep" >&6; } -if test "x$ac_cv_lib_rt_nanosleep" = x""yes; then : +if test "x$ac_cv_lib_rt_nanosleep" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __nanosleep in -lrt" >&5 $as_echo_n "checking for __nanosleep in -lrt... " >&6; } -if test "${ac_cv_lib_rt___nanosleep+set}" = set; then : +if ${ac_cv_lib_rt___nanosleep+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19228,7 +19258,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___nanosleep" >&5 $as_echo "$ac_cv_lib_rt___nanosleep" >&6; } -if test "x$ac_cv_lib_rt___nanosleep" = x""yes; then : +if test "x$ac_cv_lib_rt___nanosleep" = xyes; then : found=yes else found=no @@ -19288,7 +19318,7 @@ $as_echo "#define HAVE_LIBRT 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5 $as_echo_n "checking for getaddrinfo... " >&6; } -if test "${ac_cv_func_getaddrinfo+set}" = set; then : +if ${ac_cv_func_getaddrinfo+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19371,7 +19401,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync_fetch_and_add" >&5 $as_echo_n "checking for __sync_fetch_and_add... " >&6; } -if test "${ac_cv_func_sync_fetch_and_add+set}" = set; then : +if ${ac_cv_func_sync_fetch_and_add+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19401,25 +19431,44 @@ $as_echo "#define HAVE_SYNC_FETCH_AND_ADD 1" >>confdefs.h fi -for ac_func in strlcat strlcpy getopt -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" "strlcat" "ac_cv_func_strlcat" +if test "x$ac_cv_func_strlcat" = xyes; then : + $as_echo "#define HAVE_STRLCAT 1" >>confdefs.h else case " $LIBOBJS " in - *" $ac_func.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" + *" strlcat.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS strlcat.$ac_objext" + ;; +esac + +fi + +ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" +if test "x$ac_cv_func_strlcpy" = xyes; then : + $as_echo "#define HAVE_STRLCPY 1" >>confdefs.h + +else + case " $LIBOBJS " in + *" strlcpy.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS strlcpy.$ac_objext" + ;; +esac + +fi + +ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt" +if test "x$ac_cv_func_getopt" = xyes; then : + $as_echo "#define HAVE_GETOPT 1" >>confdefs.h + +else + case " $LIBOBJS " in + *" getopt.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS getopt.$ac_objext" ;; esac fi -done @@ -19430,8 +19479,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 @@ -19445,7 +19493,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether utime accepts a null argument" >&5 $as_echo_n "checking whether utime accepts a null argument... " >&6; } -if test "${ac_cv_func_utime_null+set}" = set; then : +if ${ac_cv_func_utime_null+:} false; then : $as_echo_n "(cached) " >&6 else rm -f conftest.data; >conftest.data @@ -19496,7 +19544,7 @@ rm -f conftest.data # for constant arguments. Useless! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 $as_echo_n "checking for working alloca.h... " >&6; } -if test "${ac_cv_working_alloca_h+set}" = set; then : +if ${ac_cv_working_alloca_h+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19529,7 +19577,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 $as_echo_n "checking for alloca... " >&6; } -if test "${ac_cv_func_alloca_works+set}" = set; then : +if ${ac_cv_func_alloca_works+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19548,7 +19596,7 @@ else #pragma alloca # else # ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); +void *alloca (size_t); # endif # endif # endif @@ -19592,7 +19640,7 @@ $as_echo "#define C_ALLOCA 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -if test "${ac_cv_os_cray+set}" = set; then : +if ${ac_cv_os_cray+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19619,8 +19667,7 @@ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; 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 CRAY_STACKSEG_END $ac_func @@ -19634,7 +19681,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 $as_echo_n "checking stack direction for C alloca... " >&6; } -if test "${ac_cv_c_stack_direction+set}" = set; then : +if ${ac_cv_c_stack_direction+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -19644,23 +19691,20 @@ else /* end confdefs.h. */ $ac_includes_default int -find_stack_direction () +find_stack_direction (int *addr, int depth) { - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; + int dir, dummy = 0; + if (! addr) + addr = &dummy; + *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1; + dir = depth ? find_stack_direction (addr, depth - 1) : 0; + return dir + dummy; } int -main () +main (int argc, char **argv) { - return find_stack_direction () < 0; + return find_stack_direction (0, argc + !argv + 20) < 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : @@ -19685,7 +19729,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for declared timezone" >&5 $as_echo_n "checking for declared timezone... " >&6; } -if test "${ac_cv_declared_timezone+set}" = set; then : +if ${ac_cv_declared_timezone+:} false; then : $as_echo_n "(cached) " >&6 else @@ -19730,7 +19774,7 @@ $as_echo "#define HAVE_DECLARED_TIMEZONE 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of reentrant time-related functions" >&5 $as_echo_n "checking for type of reentrant time-related functions... " >&6; } -if test "${ac_cv_time_r_type+set}" = set; then : +if ${ac_cv_time_r_type+:} false; then : $as_echo_n "(cached) " >&6 else @@ -19818,7 +19862,7 @@ $as_echo "#define PHP_IRIX_TIME_R 1" >>confdefs.h ac_fn_c_check_func "$LINENO" "readdir_r" "ac_cv_func_readdir_r" -if test "x$ac_cv_func_readdir_r" = x""yes; then : +if test "x$ac_cv_func_readdir_r" = xyes; then : ac_cv_func_readdir_r=yes else ac_cv_func_readdir=no @@ -19827,7 +19871,7 @@ fi if test "$ac_cv_func_readdir_r" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of readdir_r" >&5 $as_echo_n "checking for type of readdir_r... " >&6; } -if test "${ac_cv_what_readdir_r+set}" = set; then : +if ${ac_cv_what_readdir_r+:} false; then : $as_echo_n "(cached) " >&6 else @@ -19885,7 +19929,7 @@ else ac_cv_what_readdir_r=none fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -19911,7 +19955,7 @@ $as_echo "#define HAVE_OLD_READDIR_R 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for in_addr_t" >&5 $as_echo_n "checking for in_addr_t... " >&6; } -if test "${ac_cv_type_in_addr_t+set}" = set; then : +if ${ac_cv_type_in_addr_t+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19946,7 +19990,7 @@ fi for ac_func in crypt_r do : ac_fn_c_check_func "$LINENO" "crypt_r" "ac_cv_func_crypt_r" -if test "x$ac_cv_func_crypt_r" = x""yes; then : +if test "x$ac_cv_func_crypt_r" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_CRYPT_R 1 _ACEOF @@ -19960,7 +20004,7 @@ if test "x$php_crypt_r" = "x1"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking which data struct is used by crypt_r" >&5 $as_echo_n "checking which data struct is used by crypt_r... " >&6; } -if test "${php_cv_crypt_r_style+set}" = set; then : +if ${php_cv_crypt_r_style+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20056,7 +20100,7 @@ $as_echo "#define CRYPT_R_GNU_SOURCE 1" >>confdefs.h fi if test "$php_cv_crypt_r_style" = "none"; then - as_fn_error "Unable to detect data struct used by crypt_r" "$LINENO" 5 + as_fn_error $? "Unable to detect data struct used by crypt_r" "$LINENO" 5 fi fi @@ -20102,7 +20146,7 @@ $as_echo "$ext_output" >&6; } if test "$PHP_GCOV" = "yes"; then if test "$GCC" != "yes"; then - as_fn_error "GCC is required for --enable-gcov" "$LINENO" 5 + as_fn_error $? "GCC is required for --enable-gcov" "$LINENO" 5 fi case `$php_shtool path $CC` in @@ -20111,7 +20155,7 @@ if test "$PHP_GCOV" = "yes"; then esac if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then - as_fn_error "ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." "$LINENO" 5 + as_fn_error $? "ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." "$LINENO" 5 fi ltp_version_list="1.5 1.6 1.7 1.9 1.10" @@ -20120,7 +20164,7 @@ if test "$PHP_GCOV" = "yes"; then set dummy lcov; 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_LTP+set}" = set; then : +if ${ac_cv_prog_LTP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$LTP"; then @@ -20132,7 +20176,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LTP="lcov" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -20157,7 +20201,7 @@ fi set dummy genhtml; 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_LTP_GENHTML+set}" = set; then : +if ${ac_cv_prog_LTP_GENHTML+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$LTP_GENHTML"; then @@ -20169,7 +20213,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LTP_GENHTML="genhtml" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -20200,7 +20244,7 @@ fi if test "$LTP"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ltp version" >&5 $as_echo_n "checking for ltp version... " >&6; } -if test "${php_cv_ltp_version+set}" = set; then : +if ${php_cv_ltp_version+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20217,19 +20261,19 @@ fi $as_echo "$php_cv_ltp_version" >&6; } else ltp_msg="To enable code coverage reporting you must have one of the following LTP versions installed: $ltp_version_list" - as_fn_error "$ltp_msg" "$LINENO" 5 + as_fn_error $? "$ltp_msg" "$LINENO" 5 fi case $php_cv_ltp_version in ""|invalid) ltp_msg="You must have one of the following versions of LTP: $ltp_version_list (found: $ltp_version)." - as_fn_error "$ltp_msg" "$LINENO" 5 + as_fn_error $? "$ltp_msg" "$LINENO" 5 LTP="exit 0;" ;; esac if test -z "$LTP_GENHTML"; then - as_fn_error "Could not find genhtml from the LTP package" "$LINENO" 5 + as_fn_error $? "Could not find genhtml from the LTP package" "$LINENO" 5 fi @@ -20461,7 +20505,7 @@ if test "$PHP_LIBGCC" = "yes"; then if test -z "$libgcc_libpath"; then - as_fn_error "Cannot locate libgcc. Make sure that gcc is in your path" "$LINENO" 5 + as_fn_error $? "Cannot locate libgcc. Make sure that gcc is in your path" "$LINENO" 5 fi if test "$libgcc_libpath" != "/usr/$PHP_LIBDIR" && test "$libgcc_libpath" != "/usr/lib"; then @@ -20567,7 +20611,7 @@ $as_echo "$ext_output" >&6; } if test "$PHP_DMALLOC" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dmalloc_error in -ldmalloc" >&5 $as_echo_n "checking for dmalloc_error in -ldmalloc... " >&6; } -if test "${ac_cv_lib_dmalloc_dmalloc_error+set}" = set; then : +if ${ac_cv_lib_dmalloc_dmalloc_error+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -20601,7 +20645,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_dmalloc_error" >&5 $as_echo "$ac_cv_lib_dmalloc_dmalloc_error" >&6; } -if test "x$ac_cv_lib_dmalloc_dmalloc_error" = x""yes; then : +if test "x$ac_cv_lib_dmalloc_dmalloc_error" = xyes; then : @@ -20620,7 +20664,7 @@ $as_echo "#define HAVE_DMALLOC 1" >>confdefs.h else - as_fn_error "Problem with enabling dmalloc. Please check config.log for details." "$LINENO" 5 + as_fn_error $? "Problem with enabling dmalloc. Please check config.log for details." "$LINENO" 5 fi @@ -20682,7 +20726,7 @@ if test "$PHP_DTRACE" = "yes"; then for ac_header in sys/sdt.h do : ac_fn_c_check_header_mongrel "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_sdt_h" = x""yes; then : +if test "x$ac_cv_header_sys_sdt_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SYS_SDT_H 1 _ACEOF @@ -20709,10 +20753,10 @@ _ACEOF PHP_LDFLAGS="$PHP_LDFLAGS -lelf" ;; *solaris*) - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_provsrc.o" + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_provsrc.lo" ;; *linux*) - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_provsrc.o" + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_provsrc.lo" ;; esac @@ -20744,14 +20788,47 @@ _ACEOF $abs_srcdir/$ac_provsrc:; $ac_bdir$ac_hdrobj: $abs_srcdir/$ac_provsrc - CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir$ac_provsrc -o \$@.bak && \$(SED) 's,PHP_,DTRACE_,g' \$@.bak > \$@ + CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir$ac_provsrc -o \$@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$@.bak > \$@ \$(PHP_DTRACE_OBJS): $ac_bdir$ac_hdrobj +EOF + + case $host_alias in + *solaris*|*linux*) + dtrace_prov_name="`echo $ac_provsrc | $SED -e 's#\(.*\)\/##'`.o" + dtrace_lib_dir="`echo $ac_bdir$ac_provsrc | $SED -e 's#\(.*\)/[^/]*#\1#'`/.libs" + dtrace_d_obj="`echo $ac_bdir$ac_provsrc | $SED -e 's#\(.*\)/\([^/]*\)#\1/.libs/\2#'`.o" + dtrace_nolib_objs='$(PHP_DTRACE_OBJS:.lo=.o)' + for ac_lo in $PHP_DTRACE_OBJS; do + dtrace_lib_objs="$dtrace_lib_objs `echo $ac_lo | $SED -e 's,\.lo$,.o,' -e 's#\(.*\)\/#\1\/.libs\/#'`" + done; + cat>>Makefile.objects<<EOF +$ac_bdir$ac_provsrc.lo: \$(PHP_DTRACE_OBJS) + echo "# Generated by Makefile for libtool" > \$@ + @test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir + if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then \\ + echo "pic_object='.libs/$dtrace_prov_name'" >> \$@ ;\\ + else \\ + echo "pic_object='none'" >> \$@ ;\\ + fi + if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir$ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir$ac_provsrc.o"; then \\ + echo "non_pic_object='$dtrace_prov_name'" >> \$@ ;\\ + else \\ + echo "non_pic_object='none'" >> \$@ ;\\ + fi + +EOF + + ;; + *) +cat>>Makefile.objects<<EOF $ac_bdir$ac_provsrc.o: \$(PHP_DTRACE_OBJS) CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$@ -s $abs_srcdir/$ac_provsrc $dtrace_objs EOF + ;; + esac $as_echo "#define HAVE_DTRACE 1" >>confdefs.h @@ -20762,7 +20839,7 @@ $as_echo "#define HAVE_DTRACE 1" >>confdefs.h else - as_fn_error "Cannot find sys/sdt.h which is required for DTrace support" "$LINENO" 5 + as_fn_error $? "Cannot find sys/sdt.h which is required for DTrace support" "$LINENO" 5 fi @@ -20799,7 +20876,7 @@ if test "$PHP_FD_SETSIZE" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $PHP_FD_SETSIZE" >&5 $as_echo "using $PHP_FD_SETSIZE" >&6; } else - as_fn_error "Invalid value passed to --enable-fd-setsize!" "$LINENO" 5 + as_fn_error $? "Invalid value passed to --enable-fd-setsize!" "$LINENO" 5 fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: using system default" >&5 @@ -20842,7 +20919,7 @@ fi # 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 : @@ -20851,9 +20928,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 @@ -20876,7 +20952,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 : @@ -20885,9 +20961,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 @@ -20907,7 +20982,7 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int32_t" >&5 $as_echo_n "checking for int32_t... " >&6; } -if test "${ac_cv_int_type_int32_t+set}" = set; then : +if ${ac_cv_int_type_int32_t+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20953,7 +21028,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint32_t" >&5 $as_echo_n "checking for uint32_t... " >&6; } -if test "${ac_cv_int_type_uint32_t+set}" = set; then : +if ${ac_cv_int_type_uint32_t+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21007,8 +21082,7 @@ stdlib.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 @@ -21022,8 +21096,7 @@ for ac_func in strtoll atoll strftime 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 @@ -21847,7 +21920,7 @@ $as_echo "#define REGEX 0" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether field re_magic exists in struct regex_t" >&5 $as_echo_n "checking whether field re_magic exists in struct regex_t... " >&6; } -if test "${ac_cv_regex_t_re_magic+set}" = set; then : +if ${ac_cv_regex_t_re_magic+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21957,7 +22030,7 @@ if test "$PHP_LIBXML" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 $as_echo_n "checking for xml2-config path... " >&6; } -if test "${ac_cv_php_xml2_config_path+set}" = set; then : +if ${ac_cv_php_xml2_config_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -22115,7 +22188,7 @@ $as_echo "$ac_cv_php_xml2_config_path" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 $as_echo_n "checking whether libxml build works... " >&6; } -if test "${php_cv_libxml_build_works+set}" = set; then : +if ${php_cv_libxml_build_works+:} false; then : $as_echo_n "(cached) " >&6 else @@ -22153,7 +22226,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "build test failed. Please check the config.log for details." "$LINENO" 5 + as_fn_error $? "build test failed. Please check the config.log for details." "$LINENO" 5 fi @@ -22488,10 +22561,10 @@ EOF else - as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5 + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi else - as_fn_error "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 + as_fn_error $? "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 fi @@ -22876,7 +22949,7 @@ EOF set dummy krb5-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_path_KRB5_CONFIG+set}" = set; then : +if ${ac_cv_path_KRB5_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $KRB5_CONFIG in @@ -22891,7 +22964,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -23242,7 +23315,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DSA_get_default_method in -lssl" >&5 $as_echo_n "checking for DSA_get_default_method in -lssl... " >&6; } -if test "${ac_cv_lib_ssl_DSA_get_default_method+set}" = set; then : +if ${ac_cv_lib_ssl_DSA_get_default_method+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23276,7 +23349,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_DSA_get_default_method" >&5 $as_echo "$ac_cv_lib_ssl_DSA_get_default_method" >&6; } -if test "x$ac_cv_lib_ssl_DSA_get_default_method" = x""yes; then : +if test "x$ac_cv_lib_ssl_DSA_get_default_method" = xyes; then : $as_echo "#define HAVE_DSA_DEFAULT_METHOD 1" >>confdefs.h @@ -23284,7 +23357,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X509_free in -lcrypto" >&5 $as_echo_n "checking for X509_free in -lcrypto... " >&6; } -if test "${ac_cv_lib_crypto_X509_free+set}" = set; then : +if ${ac_cv_lib_crypto_X509_free+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23318,7 +23391,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_X509_free" >&5 $as_echo "$ac_cv_lib_crypto_X509_free" >&6; } -if test "x$ac_cv_lib_crypto_X509_free" = x""yes; then : +if test "x$ac_cv_lib_crypto_X509_free" = xyes; then : $as_echo "#define HAVE_DSA_DEFAULT_METHOD 1" >>confdefs.h @@ -23344,7 +23417,7 @@ fi set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -23358,7 +23431,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -23390,7 +23463,7 @@ fi OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` else - as_fn_error "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 fi if test -n "$OPENSSL_LIBS"; then @@ -23545,11 +23618,11 @@ fi done if test -z "$OPENSSL_INCDIR"; then - as_fn_error "Cannot find OpenSSL's <evp.h>" "$LINENO" 5 + as_fn_error $? "Cannot find OpenSSL's <evp.h>" "$LINENO" 5 fi if test -z "$OPENSSL_LIBDIR"; then - as_fn_error "Cannot find OpenSSL's libraries" "$LINENO" 5 + as_fn_error $? "Cannot find OpenSSL's libraries" "$LINENO" 5 fi old_CPPFLAGS=$CPPFLAGS @@ -23573,7 +23646,7 @@ $as_echo ">= 0.9.6" >&6; } else - as_fn_error "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 fi rm -f conftest* @@ -23711,7 +23784,7 @@ rm -f conftest* { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_free in -lcrypto" >&5 $as_echo_n "checking for CRYPTO_free in -lcrypto... " >&6; } -if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then : +if ${ac_cv_lib_crypto_CRYPTO_free+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23745,7 +23818,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_CRYPTO_free" >&5 $as_echo "$ac_cv_lib_crypto_CRYPTO_free" >&6; } -if test "x$ac_cv_lib_crypto_CRYPTO_free" = x""yes; then : +if test "x$ac_cv_lib_crypto_CRYPTO_free" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -23781,7 +23854,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_crypto_CRYPTO_free - as_fn_error "libcrypto not found!" "$LINENO" 5 + as_fn_error $? "libcrypto not found!" "$LINENO" 5 fi @@ -23888,7 +23961,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_ssl_version in -lssl" >&5 $as_echo_n "checking for SSL_CTX_set_ssl_version in -lssl... " >&6; } -if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then : +if ${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23922,7 +23995,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5 $as_echo "$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6; } -if test "x$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" = x""yes; then : +if test "x$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -23936,7 +24009,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version - as_fn_error "libssl not found!" "$LINENO" 5 + as_fn_error $? "libssl not found!" "$LINENO" 5 fi @@ -24039,7 +24112,7 @@ $as_echo "#define HAVE_OPENSSL_EXT 1" >>confdefs.h else - as_fn_error "OpenSSL check failed. Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "OpenSSL check failed. Please check config.log for more information." "$LINENO" 5 fi @@ -24077,7 +24150,7 @@ $as_echo_n "checking for PCRE headers location... " >&6; } done if test -z "$PCRE_INCDIR"; then - as_fn_error "Could not find pcre.h in $PHP_PCRE_REGEX" "$LINENO" 5 + as_fn_error $? "Could not find pcre.h in $PHP_PCRE_REGEX" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCRE_INCDIR" >&5 $as_echo "$PCRE_INCDIR" >&6; } @@ -24089,7 +24162,7 @@ $as_echo_n "checking for PCRE library location... " >&6; } done if test -z "$PCRE_LIBDIR" ; then - as_fn_error "Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in $PHP_PCRE_REGEX" "$LINENO" 5 + as_fn_error $? "Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in $PHP_PCRE_REGEX" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCRE_LIBDIR" >&5 $as_echo "$PCRE_LIBDIR" >&6; } @@ -24104,7 +24177,7 @@ $as_echo "$PCRE_LIBDIR" >&6; } fi pcre_version=$pcre_major$pcre_minor if test "$pcre_version" -lt 660; then - as_fn_error "The PCRE extension requires PCRE library version >= 6.6" "$LINENO" 5 + as_fn_error $? "The PCRE extension requires PCRE library version >= 6.6" "$LINENO" 5 fi @@ -24914,7 +24987,7 @@ $as_echo "found in $i" >&6; } if test -z "$SQLITE3_DIR"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - as_fn_error "Please reinstall the sqlite distribution from http://www.sqlite.org" "$LINENO" 5 + as_fn_error $? "Please reinstall the sqlite distribution from http://www.sqlite.org" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLite 3.3.9+" >&5 @@ -25018,7 +25091,7 @@ $as_echo_n "checking for SQLite 3.3.9+... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_prepare_v2 in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_prepare_v2+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_prepare_v2+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25052,7 +25125,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_prepare_v2" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_prepare_v2" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -25197,7 +25270,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - as_fn_error "Please install SQLite 3.3.9 first or check libsqlite3 is present" "$LINENO" 5 + as_fn_error $? "Please install SQLite 3.3.9 first or check libsqlite3 is present" "$LINENO" 5 fi @@ -25300,7 +25373,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_key in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_key in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_key+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_key+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25334,7 +25407,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_key" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_key" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_key" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_key" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -25450,7 +25523,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_column_table_name in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_column_table_name in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_column_table_name+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_column_table_name+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25484,7 +25557,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_column_table_name" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_column_table_name" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_column_table_name" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_column_table_name" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -25601,7 +25674,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_load_extension in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_load_extension in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_load_extension+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_load_extension+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25635,7 +25708,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_load_extension" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_load_extension" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -26397,7 +26470,7 @@ EOF fi if test -z "$ZLIB_DIR"; then - as_fn_error "Cannot find libz" "$LINENO" 5 + as_fn_error $? "Cannot find libz" "$LINENO" 5 fi case $ZLIB_DIR in @@ -26411,7 +26484,7 @@ $as_echo_n "checking for zlib version >= 1.2.0.4... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZLIB_VERSION" >&5 $as_echo "$ZLIB_VERSION" >&6; } if test `echo $ZLIB_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then - as_fn_error "libz version greater or equal to 1.2.0.4 required" "$LINENO" 5 + as_fn_error $? "libz version greater or equal to 1.2.0.4 required" "$LINENO" 5 fi @@ -26513,7 +26586,7 @@ $as_echo "$ZLIB_VERSION" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzgets in -lz" >&5 $as_echo_n "checking for gzgets in -lz... " >&6; } -if test "${ac_cv_lib_z_gzgets+set}" = set; then : +if ${ac_cv_lib_z_gzgets+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -26547,7 +26620,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzgets" >&5 $as_echo "$ac_cv_lib_z_gzgets" >&6; } -if test "x$ac_cv_lib_z_gzgets" = x""yes; then : +if test "x$ac_cv_lib_z_gzgets" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -26563,7 +26636,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_z_gzgets - as_fn_error "ZLIB extension requires gzgets in zlib" "$LINENO" 5 + as_fn_error $? "ZLIB extension requires gzgets in zlib" "$LINENO" 5 fi @@ -27096,7 +27169,7 @@ $as_echo "found in $i" >&6; } if test -z "$BZIP_DIR"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - as_fn_error "Please reinstall the BZip2 distribution" "$LINENO" 5 + as_fn_error $? "Please reinstall the BZip2 distribution" "$LINENO" 5 fi @@ -27198,7 +27271,7 @@ $as_echo "not found" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzerror in -lbz2" >&5 $as_echo_n "checking for BZ2_bzerror in -lbz2... " >&6; } -if test "${ac_cv_lib_bz2_BZ2_bzerror+set}" = set; then : +if ${ac_cv_lib_bz2_BZ2_bzerror+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27232,7 +27305,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzerror" >&5 $as_echo "$ac_cv_lib_bz2_BZ2_bzerror" >&6; } -if test "x$ac_cv_lib_bz2_BZ2_bzerror" = x""yes; then : +if test "x$ac_cv_lib_bz2_BZ2_bzerror" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -27376,7 +27449,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_bz2_BZ2_bzerror - as_fn_error "bz2 module requires libbz2 >= 1.0.0" "$LINENO" 5 + as_fn_error $? "bz2 module requires libbz2 >= 1.0.0" "$LINENO" 5 fi @@ -28433,7 +28506,7 @@ $as_echo "found in $i" >&6; } if test -z "$CURL_DIR"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - as_fn_error "Please reinstall the libcurl distribution - + as_fn_error $? "Please reinstall the libcurl distribution - easy.h should be in <curl-dir>/include/curl/" "$LINENO" 5 fi @@ -28456,7 +28529,7 @@ $as_echo_n "checking for cURL 7.10.5 or greater... " >&6; } $as_echo "$curl_version_full" >&6; } CURL_LIBS=`$CURL_CONFIG --libs` else - as_fn_error "cURL version 7.10.5 or later is required to compile php with cURL support" "$LINENO" 5 + as_fn_error $? "cURL version 7.10.5 or later is required to compile php with cURL support" "$LINENO" 5 fi @@ -28702,7 +28775,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 @@ -28732,7 +28805,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. @@ -28748,11 +28821,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 @@ -28791,7 +28864,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. @@ -28807,18 +28880,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 @@ -28861,7 +28934,7 @@ $as_echo "yes" >&6; } 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 @@ -28918,7 +28991,7 @@ if ac_fn_c_try_run "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "gcrypt.h" "ac_cv_header_gcrypt_h" "$ac_includes_default" -if test "x$ac_cv_header_gcrypt_h" = x""yes; then : +if test "x$ac_cv_header_gcrypt_h" = xyes; then : $as_echo "#define HAVE_CURL_GNUTLS 1" >>confdefs.h @@ -29044,7 +29117,7 @@ $as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_perform in -lcurl" >&5 $as_echo_n "checking for curl_easy_perform in -lcurl... " >&6; } -if test "${ac_cv_lib_curl_curl_easy_perform+set}" = set; then : +if ${ac_cv_lib_curl_curl_easy_perform+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29078,7 +29151,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_perform" >&5 $as_echo "$ac_cv_lib_curl_curl_easy_perform" >&6; } -if test "x$ac_cv_lib_curl_curl_easy_perform" = x""yes; then : +if test "x$ac_cv_lib_curl_curl_easy_perform" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -29094,7 +29167,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_curl_curl_easy_perform - as_fn_error "There is something wrong. Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "There is something wrong. Please check config.log for more information." "$LINENO" 5 fi @@ -29199,7 +29272,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_strerror in -lcurl" >&5 $as_echo_n "checking for curl_easy_strerror in -lcurl... " >&6; } -if test "${ac_cv_lib_curl_curl_easy_strerror+set}" = set; then : +if ${ac_cv_lib_curl_curl_easy_strerror+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29233,7 +29306,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_strerror" >&5 $as_echo "$ac_cv_lib_curl_curl_easy_strerror" >&6; } -if test "x$ac_cv_lib_curl_curl_easy_strerror" = x""yes; then : +if test "x$ac_cv_lib_curl_curl_easy_strerror" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -29352,7 +29425,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_multi_strerror in -lcurl" >&5 $as_echo_n "checking for curl_multi_strerror in -lcurl... " >&6; } -if test "${ac_cv_lib_curl_curl_multi_strerror+set}" = set; then : +if ${ac_cv_lib_curl_curl_multi_strerror+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29386,7 +29459,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_multi_strerror" >&5 $as_echo "$ac_cv_lib_curl_curl_multi_strerror" >&6; } -if test "x$ac_cv_lib_curl_curl_multi_strerror" = x""yes; then : +if test "x$ac_cv_lib_curl_curl_multi_strerror" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -30074,7 +30147,7 @@ if test "$PHP_QDBM" != "no"; then as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_dpopen" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dpopen in -l$LIB" >&5 $as_echo_n "checking for dpopen in -l$LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -30109,8 +30182,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -30149,10 +30221,10 @@ fi THIS_RESULT=yes if test -z "$THIS_INCLUDE"; then - as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi if test -z "$THIS_LIBS"; then - as_fn_error "DBA: Could not find necessary library." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi @@ -30266,7 +30338,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then - as_fn_error "" "$LINENO" 5 + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -30296,7 +30368,7 @@ if test "$PHP_GDBM" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n "You cannot combine --with-gdbm with --with-qdbm"; then - as_fn_error "You cannot combine --with-gdbm with --with-qdbm" "$LINENO" 5 + as_fn_error $? "You cannot combine --with-gdbm with --with-qdbm" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -30416,7 +30488,7 @@ $as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdbm_open in -lgdbm" >&5 $as_echo_n "checking for gdbm_open in -lgdbm... " >&6; } -if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then : +if ${ac_cv_lib_gdbm_gdbm_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -30450,7 +30522,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_gdbm_open" >&5 $as_echo "$ac_cv_lib_gdbm_gdbm_open" >&6; } -if test "x$ac_cv_lib_gdbm_gdbm_open" = x""yes; then : +if test "x$ac_cv_lib_gdbm_gdbm_open" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -30485,10 +30557,10 @@ fi THIS_RESULT=yes if test -z "$THIS_INCLUDE"; then - as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi if test -z "$THIS_LIBS"; then - as_fn_error "DBA: Could not find necessary library." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi @@ -30602,7 +30674,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then - as_fn_error "" "$LINENO" 5 + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -30733,7 +30805,7 @@ if test "$PHP_NDBM" != "no"; then as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_dbm_open" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -l$LIB" >&5 $as_echo_n "checking for dbm_open in -l$LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -30768,8 +30840,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -30808,10 +30879,10 @@ fi THIS_RESULT=yes if test -z "$THIS_INCLUDE"; then - as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi if test -z "$THIS_LIBS"; then - as_fn_error "DBA: Could not find necessary library." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi @@ -30925,7 +30996,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then - as_fn_error "" "$LINENO" 5 + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -31082,7 +31153,7 @@ if test "$PHP_TCADB" != "no"; then as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_tcadbopen" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcadbopen in -l$LIB" >&5 $as_echo_n "checking for tcadbopen in -l$LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -31117,8 +31188,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -31157,10 +31227,10 @@ fi THIS_RESULT=yes if test -z "$THIS_INCLUDE"; then - as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi if test -z "$THIS_LIBS"; then - as_fn_error "DBA: Could not find necessary library." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi @@ -31274,7 +31344,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then - as_fn_error "" "$LINENO" 5 + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -31350,7 +31420,7 @@ if test "$PHP_DB4" != "no"; then done if test -z "$THIS_INCLUDE"; then - as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi for LIB in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db; do if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then @@ -31413,7 +31483,7 @@ rm -f core conftest.err conftest.$ac_objext \ if test -z "$THIS_LIBS"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 major version" >&5 $as_echo_n "checking for DB4 major version... " >&6; } - as_fn_error "Header contains different version" "$LINENO" 5 + as_fn_error $? "Header contains different version" "$LINENO" 5 fi if test "4" = "4"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5 @@ -31435,7 +31505,7 @@ $as_echo "ok" >&6; } else - as_fn_error "Version 4.1 requires patch level 25" "$LINENO" 5 + as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5 fi rm -f conftest* @@ -31461,7 +31531,7 @@ $as_echo "yes" >&6; } else - as_fn_error "At least version 3.3 is required" "$LINENO" 5 + as_fn_error $? "At least version 3.3 is required" "$LINENO" 5 fi rm -f conftest* @@ -31479,7 +31549,7 @@ _ACEOF fi else - as_fn_error "DBA: Could not find necessary library." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi THIS_RESULT=yes DB4_LIBS=$THIS_LIBS @@ -31602,7 +31672,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then - as_fn_error "" "$LINENO" 5 + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -31632,7 +31702,7 @@ if test "$PHP_DB3" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n "You cannot combine --with-db3 with --with-db4"; then - as_fn_error "You cannot combine --with-db3 with --with-db4" "$LINENO" 5 + as_fn_error $? "You cannot combine --with-db3 with --with-db4" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -31671,7 +31741,7 @@ $as_echo "no" >&6; } done if test -z "$THIS_INCLUDE"; then - as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi for LIB in db-3.3 db-3.2 db-3.1 db-3.0 db-3 db3 db; do if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then @@ -31734,7 +31804,7 @@ rm -f core conftest.err conftest.$ac_objext \ if test -z "$THIS_LIBS"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB3 major version" >&5 $as_echo_n "checking for DB3 major version... " >&6; } - as_fn_error "Header contains different version" "$LINENO" 5 + as_fn_error $? "Header contains different version" "$LINENO" 5 fi if test "3" = "4"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5 @@ -31756,7 +31826,7 @@ $as_echo "ok" >&6; } else - as_fn_error "Version 4.1 requires patch level 25" "$LINENO" 5 + as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5 fi rm -f conftest* @@ -31782,7 +31852,7 @@ $as_echo "yes" >&6; } else - as_fn_error "At least version 3.3 is required" "$LINENO" 5 + as_fn_error $? "At least version 3.3 is required" "$LINENO" 5 fi rm -f conftest* @@ -31800,7 +31870,7 @@ _ACEOF fi else - as_fn_error "DBA: Could not find necessary library." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi THIS_RESULT=yes DB3_LIBS=$THIS_LIBS @@ -31923,7 +31993,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then - as_fn_error "" "$LINENO" 5 + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -31953,7 +32023,7 @@ if test "$PHP_DB2" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then - as_fn_error "You cannot combine --with-db2 with --with-db3 or --with-db4" "$LINENO" 5 + as_fn_error $? "You cannot combine --with-db2 with --with-db3 or --with-db4" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -31992,7 +32062,7 @@ $as_echo "no" >&6; } done if test -z "$THIS_INCLUDE"; then - as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi for LIB in db-2 db2 db; do if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then @@ -32055,7 +32125,7 @@ rm -f core conftest.err conftest.$ac_objext \ if test -z "$THIS_LIBS"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB2 major version" >&5 $as_echo_n "checking for DB2 major version... " >&6; } - as_fn_error "Header contains different version" "$LINENO" 5 + as_fn_error $? "Header contains different version" "$LINENO" 5 fi if test "2" = "4"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5 @@ -32077,7 +32147,7 @@ $as_echo "ok" >&6; } else - as_fn_error "Version 4.1 requires patch level 25" "$LINENO" 5 + as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5 fi rm -f conftest* @@ -32103,7 +32173,7 @@ $as_echo "yes" >&6; } else - as_fn_error "At least version 3.3 is required" "$LINENO" 5 + as_fn_error $? "At least version 3.3 is required" "$LINENO" 5 fi rm -f conftest* @@ -32121,7 +32191,7 @@ _ACEOF fi else - as_fn_error "DBA: Could not find necessary library." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi THIS_RESULT=yes DB2_LIBS=$THIS_LIBS @@ -32244,7 +32314,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then - as_fn_error "" "$LINENO" 5 + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -32372,10 +32442,10 @@ rm -f core conftest.err conftest.$ac_objext \ THIS_RESULT=yes if test -z "$THIS_INCLUDE"; then - as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi if test -z "$THIS_LIBS"; then - as_fn_error "DBA: Could not find necessary library." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi @@ -32489,7 +32559,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then - as_fn_error "" "$LINENO" 5 + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -32519,7 +32589,7 @@ if test "$PHP_DBM" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n "You cannot combine --with-dbm with --with-qdbm"; then - as_fn_error "You cannot combine --with-dbm with --with-qdbm" "$LINENO" 5 + as_fn_error $? "You cannot combine --with-dbm with --with-qdbm" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -32645,7 +32715,7 @@ $as_echo "no" >&6; } as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_dbminit" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbminit in -l$LIB" >&5 $as_echo_n "checking for dbminit in -l$LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -32680,8 +32750,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -32739,10 +32808,10 @@ fi THIS_RESULT=yes if test -z "$THIS_INCLUDE"; then - as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi if test -z "$THIS_LIBS"; then - as_fn_error "DBA: Could not find necessary library." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi @@ -32856,7 +32925,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then - as_fn_error "" "$LINENO" 5 + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -33065,7 +33134,7 @@ elif test "$PHP_CDB" != "no"; then as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_cdb_read" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cdb_read in -l$LIB" >&5 $as_echo_n "checking for cdb_read in -l$LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -33100,8 +33169,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -33140,10 +33208,10 @@ fi THIS_RESULT=yes if test -z "$THIS_INCLUDE"; then - as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi if test -z "$THIS_LIBS"; then - as_fn_error "DBA: Could not find necessary library." "$LINENO" 5 + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi @@ -33257,7 +33325,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then - as_fn_error "" "$LINENO" 5 + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -33289,7 +33357,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then - as_fn_error "" "$LINENO" 5 + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -33321,7 +33389,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 $as_echo_n "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then - as_fn_error "" "$LINENO" 5 + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 @@ -33738,13 +33806,13 @@ fi if test "$PHP_DOM" != "no"; then if test "$PHP_LIBXML" = "no"; then - as_fn_error "DOM extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 + as_fn_error $? "DOM extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 $as_echo_n "checking for xml2-config path... " >&6; } -if test "${ac_cv_php_xml2_config_path+set}" = set; then : +if ${ac_cv_php_xml2_config_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -33902,7 +33970,7 @@ $as_echo "$ac_cv_php_xml2_config_path" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 $as_echo_n "checking whether libxml build works... " >&6; } -if test "${php_cv_libxml_build_works+set}" = set; then : +if ${php_cv_libxml_build_works+:} false; then : $as_echo_n "(cached) " >&6 else @@ -33940,7 +34008,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "build test failed. Please check the config.log for details." "$LINENO" 5 + as_fn_error $? "build test failed. Please check the config.log for details." "$LINENO" 5 fi @@ -34317,7 +34385,7 @@ EOF is_it_shared=$PHP_LIBXML_SHARED is_it_enabled=$PHP_LIBXML if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension dom to build statically, but it depends on extension libxml, which you've configured to build shared. You either need to build dom shared or build libxml statically for the @@ -34325,7 +34393,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension dom, which depends on extension libxml, but you've either not enabled libxml, or have disabled it. " "$LINENO" 5 @@ -34333,10 +34401,10 @@ but you've either not enabled libxml, or have disabled it. else - as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5 + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi else - as_fn_error "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 + as_fn_error $? "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 fi @@ -34698,7 +34766,7 @@ EOF done if test -z "$ENCHANT_DIR"; then - as_fn_error "Cannot find enchant" "$LINENO" 5 + as_fn_error $? "Cannot find enchant" "$LINENO" 5 fi ENCHANT_LIBDIR=$ENCHANT_DIR/lib @@ -34934,7 +35002,7 @@ $as_echo "#define HAVE_ENCHANT 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant_broker_set_param in -lenchant" >&5 $as_echo_n "checking for enchant_broker_set_param in -lenchant... " >&6; } -if test "${ac_cv_lib_enchant_enchant_broker_set_param+set}" = set; then : +if ${ac_cv_lib_enchant_enchant_broker_set_param+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -34968,7 +35036,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_broker_set_param" >&5 $as_echo "$ac_cv_lib_enchant_enchant_broker_set_param" >&6; } -if test "x$ac_cv_lib_enchant_enchant_broker_set_param" = x""yes; then : +if test "x$ac_cv_lib_enchant_enchant_broker_set_param" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -35694,8 +35762,7 @@ EOF 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 @@ -36152,7 +36219,7 @@ EOF is_it_shared=$PHP_PCRE_SHARED is_it_enabled=$PHP_PCRE if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension filter to build statically, but it depends on extension pcre, which you've configured to build shared. You either need to build filter shared or build pcre statically for the @@ -36160,7 +36227,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension filter, which depends on extension pcre, but you've either not enabled pcre, or have disabled it. " "$LINENO" 5 @@ -36557,7 +36624,7 @@ EOF set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -36571,7 +36638,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -36603,7 +36670,7 @@ fi OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` else - as_fn_error "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 fi if test -n "$OPENSSL_LIBS"; then @@ -36758,11 +36825,11 @@ fi done if test -z "$OPENSSL_INCDIR"; then - as_fn_error "Cannot find OpenSSL's <evp.h>" "$LINENO" 5 + as_fn_error $? "Cannot find OpenSSL's <evp.h>" "$LINENO" 5 fi if test -z "$OPENSSL_LIBDIR"; then - as_fn_error "Cannot find OpenSSL's libraries" "$LINENO" 5 + as_fn_error $? "Cannot find OpenSSL's libraries" "$LINENO" 5 fi old_CPPFLAGS=$CPPFLAGS @@ -36786,7 +36853,7 @@ $as_echo ">= 0.9.6" >&6; } else - as_fn_error "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 fi rm -f conftest* @@ -36924,7 +36991,7 @@ rm -f conftest* { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_free in -lcrypto" >&5 $as_echo_n "checking for CRYPTO_free in -lcrypto... " >&6; } -if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then : +if ${ac_cv_lib_crypto_CRYPTO_free+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -36958,7 +37025,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_CRYPTO_free" >&5 $as_echo "$ac_cv_lib_crypto_CRYPTO_free" >&6; } -if test "x$ac_cv_lib_crypto_CRYPTO_free" = x""yes; then : +if test "x$ac_cv_lib_crypto_CRYPTO_free" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -36994,7 +37061,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_crypto_CRYPTO_free - as_fn_error "libcrypto not found!" "$LINENO" 5 + as_fn_error $? "libcrypto not found!" "$LINENO" 5 fi @@ -37101,7 +37168,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_ssl_version in -lssl" >&5 $as_echo_n "checking for SSL_CTX_set_ssl_version in -lssl... " >&6; } -if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then : +if ${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -37135,7 +37202,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5 $as_echo "$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6; } -if test "x$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" = x""yes; then : +if test "x$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -37149,7 +37216,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version - as_fn_error "libssl not found!" "$LINENO" 5 + as_fn_error $? "libssl not found!" "$LINENO" 5 fi @@ -37559,7 +37626,7 @@ if test "$PHP_GD" != "no"; then PHP_ZLIB_DIR="$PHP_ZLIB_DIR" PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" else - as_fn_error "Can't find zlib headers under \"$PHP_ZLIB_DIR\"" "$LINENO" 5 + as_fn_error $? "Can't find zlib headers under \"$PHP_ZLIB_DIR\"" "$LINENO" 5 fi else for i in /usr/local /usr; do @@ -37588,7 +37655,7 @@ $as_echo "#define USE_GD_IMGSTRTTF 1" >>confdefs.h done if test -z "$GD_VPX_DIR"; then - as_fn_error "vpx_codec.h not found." "$LINENO" 5 + as_fn_error $? "vpx_codec.h not found." "$LINENO" 5 fi @@ -37690,7 +37757,7 @@ $as_echo "#define USE_GD_IMGSTRTTF 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vpx_codec_destroy in -lvpx" >&5 $as_echo_n "checking for vpx_codec_destroy in -lvpx... " >&6; } -if test "${ac_cv_lib_vpx_vpx_codec_destroy+set}" = set; then : +if ${ac_cv_lib_vpx_vpx_codec_destroy+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -37724,7 +37791,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vpx_vpx_codec_destroy" >&5 $as_echo "$ac_cv_lib_vpx_vpx_codec_destroy" >&6; } -if test "x$ac_cv_lib_vpx_vpx_codec_destroy" = x""yes; then : +if test "x$ac_cv_lib_vpx_vpx_codec_destroy" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -37875,7 +37942,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_vpx_vpx_codec_destroy - as_fn_error "Problem with libvpx.(a|so). Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Problem with libvpx.(a|so). Please check config.log for more information." "$LINENO" 5 fi @@ -37893,7 +37960,7 @@ $as_echo "If configure fails try --with-vpx-dir=<DIR>" >&6; } done if test -z "$GD_JPEG_DIR"; then - as_fn_error "jpeglib.h not found." "$LINENO" 5 + as_fn_error $? "jpeglib.h not found." "$LINENO" 5 fi @@ -37995,7 +38062,7 @@ $as_echo "If configure fails try --with-vpx-dir=<DIR>" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_read_header in -ljpeg" >&5 $as_echo_n "checking for jpeg_read_header in -ljpeg... " >&6; } -if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then : +if ${ac_cv_lib_jpeg_jpeg_read_header+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -38029,7 +38096,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5 $as_echo "$ac_cv_lib_jpeg_jpeg_read_header" >&6; } -if test "x$ac_cv_lib_jpeg_jpeg_read_header" = x""yes; then : +if test "x$ac_cv_lib_jpeg_jpeg_read_header" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -38170,7 +38237,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_jpeg_jpeg_read_header - as_fn_error "Problem with libjpeg.(a|so). Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Problem with libjpeg.(a|so). Please check config.log for more information." "$LINENO" 5 fi @@ -38188,11 +38255,11 @@ $as_echo "If configure fails try --with-jpeg-dir=<DIR>" >&6; } done if test -z "$GD_PNG_DIR"; then - as_fn_error "png.h not found." "$LINENO" 5 + as_fn_error $? "png.h not found." "$LINENO" 5 fi if test "$PHP_ZLIB_DIR" = "no"; then - as_fn_error "PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" "$LINENO" 5 + as_fn_error $? "PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" "$LINENO" 5 fi @@ -38294,7 +38361,7 @@ $as_echo "If configure fails try --with-jpeg-dir=<DIR>" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_write_image in -lpng" >&5 $as_echo_n "checking for png_write_image in -lpng... " >&6; } -if test "${ac_cv_lib_png_png_write_image+set}" = set; then : +if ${ac_cv_lib_png_png_write_image+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -38328,7 +38395,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_write_image" >&5 $as_echo "$ac_cv_lib_png_png_write_image" >&6; } -if test "x$ac_cv_lib_png_png_write_image" = x""yes; then : +if test "x$ac_cv_lib_png_png_write_image" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -38566,7 +38633,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_png_png_write_image - as_fn_error "Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." "$LINENO" 5 fi @@ -38586,7 +38653,7 @@ $as_echo "If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" done if test -z "$GD_XPM_DIR"; then - as_fn_error "xpm.h not found." "$LINENO" 5 + as_fn_error $? "xpm.h not found." "$LINENO" 5 fi @@ -38688,7 +38755,7 @@ $as_echo "If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmFreeXpmImage in -lXpm" >&5 $as_echo_n "checking for XpmFreeXpmImage in -lXpm... " >&6; } -if test "${ac_cv_lib_Xpm_XpmFreeXpmImage+set}" = set; then : +if ${ac_cv_lib_Xpm_XpmFreeXpmImage+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -38722,7 +38789,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmFreeXpmImage" >&5 $as_echo "$ac_cv_lib_Xpm_XpmFreeXpmImage" >&6; } -if test "x$ac_cv_lib_Xpm_XpmFreeXpmImage" = x""yes; then : +if test "x$ac_cv_lib_Xpm_XpmFreeXpmImage" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -38960,7 +39027,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_Xpm_XpmFreeXpmImage - as_fn_error "Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." "$LINENO" 5 fi @@ -38982,7 +39049,7 @@ $as_echo "If configure fails try --with-xpm-dir=<DIR>" >&6; } done if test -z "$FREETYPE2_DIR"; then - as_fn_error "freetype.h not found." "$LINENO" 5 + as_fn_error $? "freetype.h not found." "$LINENO" 5 fi @@ -39084,7 +39151,7 @@ $as_echo "If configure fails try --with-xpm-dir=<DIR>" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_New_Face in -lfreetype" >&5 $as_echo_n "checking for FT_New_Face in -lfreetype... " >&6; } -if test "${ac_cv_lib_freetype_FT_New_Face+set}" = set; then : +if ${ac_cv_lib_freetype_FT_New_Face+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -39118,7 +39185,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_New_Face" >&5 $as_echo "$ac_cv_lib_freetype_FT_New_Face" >&6; } -if test "x$ac_cv_lib_freetype_FT_New_Face" = x""yes; then : +if test "x$ac_cv_lib_freetype_FT_New_Face" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -39299,7 +39366,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_freetype_FT_New_Face - as_fn_error "Problem with freetype.(a|so). Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Problem with freetype.(a|so). Please check config.log for more information." "$LINENO" 5 fi @@ -39317,7 +39384,7 @@ $as_echo "If configure fails try --with-freetype-dir=<DIR>" >&6; } done if test -z "$GD_T1_DIR"; then - as_fn_error "Your t1lib distribution is not installed correctly. Please reinstall it." "$LINENO" 5 + as_fn_error $? "Your t1lib distribution is not installed correctly. Please reinstall it." "$LINENO" 5 fi @@ -39419,7 +39486,7 @@ $as_echo "If configure fails try --with-freetype-dir=<DIR>" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for T1_StrError in -lt1" >&5 $as_echo_n "checking for T1_StrError in -lt1... " >&6; } -if test "${ac_cv_lib_t1_T1_StrError+set}" = set; then : +if ${ac_cv_lib_t1_T1_StrError+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -39453,7 +39520,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_t1_T1_StrError" >&5 $as_echo "$ac_cv_lib_t1_T1_StrError" >&6; } -if test "x$ac_cv_lib_t1_T1_StrError" = x""yes; then : +if test "x$ac_cv_lib_t1_T1_StrError" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -39597,7 +39664,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_t1_T1_StrError - as_fn_error "Problem with libt1.(a|so). Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Problem with libt1.(a|so). Please check config.log for more information." "$LINENO" 5 fi @@ -39626,8 +39693,7 @@ if test "$PHP_GD" = "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 @@ -39702,7 +39768,7 @@ else PHP_ZLIB_DIR="$PHP_ZLIB_DIR" PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" else - as_fn_error "Can't find zlib headers under \"$PHP_ZLIB_DIR\"" "$LINENO" 5 + as_fn_error $? "Can't find zlib headers under \"$PHP_ZLIB_DIR\"" "$LINENO" 5 fi else for i in /usr/local /usr; do @@ -39731,7 +39797,7 @@ $as_echo "#define USE_GD_IMGSTRTTF 1" >>confdefs.h done if test -z "$GD_VPX_DIR"; then - as_fn_error "vpx_codec.h not found." "$LINENO" 5 + as_fn_error $? "vpx_codec.h not found." "$LINENO" 5 fi @@ -39833,7 +39899,7 @@ $as_echo "#define USE_GD_IMGSTRTTF 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vpx_codec_destroy in -lvpx" >&5 $as_echo_n "checking for vpx_codec_destroy in -lvpx... " >&6; } -if test "${ac_cv_lib_vpx_vpx_codec_destroy+set}" = set; then : +if ${ac_cv_lib_vpx_vpx_codec_destroy+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -39867,7 +39933,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vpx_vpx_codec_destroy" >&5 $as_echo "$ac_cv_lib_vpx_vpx_codec_destroy" >&6; } -if test "x$ac_cv_lib_vpx_vpx_codec_destroy" = x""yes; then : +if test "x$ac_cv_lib_vpx_vpx_codec_destroy" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -40018,7 +40084,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_vpx_vpx_codec_destroy - as_fn_error "Problem with libvpx.(a|so). Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Problem with libvpx.(a|so). Please check config.log for more information." "$LINENO" 5 fi @@ -40036,7 +40102,7 @@ $as_echo "If configure fails try --with-vpx-dir=<DIR>" >&6; } done if test -z "$GD_JPEG_DIR"; then - as_fn_error "jpeglib.h not found." "$LINENO" 5 + as_fn_error $? "jpeglib.h not found." "$LINENO" 5 fi @@ -40138,7 +40204,7 @@ $as_echo "If configure fails try --with-vpx-dir=<DIR>" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_read_header in -ljpeg" >&5 $as_echo_n "checking for jpeg_read_header in -ljpeg... " >&6; } -if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then : +if ${ac_cv_lib_jpeg_jpeg_read_header+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -40172,7 +40238,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5 $as_echo "$ac_cv_lib_jpeg_jpeg_read_header" >&6; } -if test "x$ac_cv_lib_jpeg_jpeg_read_header" = x""yes; then : +if test "x$ac_cv_lib_jpeg_jpeg_read_header" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -40313,7 +40379,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_jpeg_jpeg_read_header - as_fn_error "Problem with libjpeg.(a|so). Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Problem with libjpeg.(a|so). Please check config.log for more information." "$LINENO" 5 fi @@ -40331,11 +40397,11 @@ $as_echo "If configure fails try --with-jpeg-dir=<DIR>" >&6; } done if test -z "$GD_PNG_DIR"; then - as_fn_error "png.h not found." "$LINENO" 5 + as_fn_error $? "png.h not found." "$LINENO" 5 fi if test "$PHP_ZLIB_DIR" = "no"; then - as_fn_error "PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" "$LINENO" 5 + as_fn_error $? "PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" "$LINENO" 5 fi @@ -40437,7 +40503,7 @@ $as_echo "If configure fails try --with-jpeg-dir=<DIR>" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_write_image in -lpng" >&5 $as_echo_n "checking for png_write_image in -lpng... " >&6; } -if test "${ac_cv_lib_png_png_write_image+set}" = set; then : +if ${ac_cv_lib_png_png_write_image+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -40471,7 +40537,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_write_image" >&5 $as_echo "$ac_cv_lib_png_png_write_image" >&6; } -if test "x$ac_cv_lib_png_png_write_image" = x""yes; then : +if test "x$ac_cv_lib_png_png_write_image" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -40709,7 +40775,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_png_png_write_image - as_fn_error "Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." "$LINENO" 5 fi @@ -40729,7 +40795,7 @@ $as_echo "If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" done if test -z "$GD_XPM_DIR"; then - as_fn_error "xpm.h not found." "$LINENO" 5 + as_fn_error $? "xpm.h not found." "$LINENO" 5 fi @@ -40831,7 +40897,7 @@ $as_echo "If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmFreeXpmImage in -lXpm" >&5 $as_echo_n "checking for XpmFreeXpmImage in -lXpm... " >&6; } -if test "${ac_cv_lib_Xpm_XpmFreeXpmImage+set}" = set; then : +if ${ac_cv_lib_Xpm_XpmFreeXpmImage+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -40865,7 +40931,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmFreeXpmImage" >&5 $as_echo "$ac_cv_lib_Xpm_XpmFreeXpmImage" >&6; } -if test "x$ac_cv_lib_Xpm_XpmFreeXpmImage" = x""yes; then : +if test "x$ac_cv_lib_Xpm_XpmFreeXpmImage" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -41103,7 +41169,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_Xpm_XpmFreeXpmImage - as_fn_error "Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." "$LINENO" 5 fi @@ -41125,7 +41191,7 @@ $as_echo "If configure fails try --with-xpm-dir=<DIR>" >&6; } done if test -z "$FREETYPE2_DIR"; then - as_fn_error "freetype.h not found." "$LINENO" 5 + as_fn_error $? "freetype.h not found." "$LINENO" 5 fi @@ -41227,7 +41293,7 @@ $as_echo "If configure fails try --with-xpm-dir=<DIR>" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_New_Face in -lfreetype" >&5 $as_echo_n "checking for FT_New_Face in -lfreetype... " >&6; } -if test "${ac_cv_lib_freetype_FT_New_Face+set}" = set; then : +if ${ac_cv_lib_freetype_FT_New_Face+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -41261,7 +41327,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_New_Face" >&5 $as_echo "$ac_cv_lib_freetype_FT_New_Face" >&6; } -if test "x$ac_cv_lib_freetype_FT_New_Face" = x""yes; then : +if test "x$ac_cv_lib_freetype_FT_New_Face" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -41442,7 +41508,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_freetype_FT_New_Face - as_fn_error "Problem with freetype.(a|so). Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Problem with freetype.(a|so). Please check config.log for more information." "$LINENO" 5 fi @@ -41460,7 +41526,7 @@ $as_echo "If configure fails try --with-freetype-dir=<DIR>" >&6; } done if test -z "$GD_T1_DIR"; then - as_fn_error "Your t1lib distribution is not installed correctly. Please reinstall it." "$LINENO" 5 + as_fn_error $? "Your t1lib distribution is not installed correctly. Please reinstall it." "$LINENO" 5 fi @@ -41562,7 +41628,7 @@ $as_echo "If configure fails try --with-freetype-dir=<DIR>" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for T1_StrError in -lt1" >&5 $as_echo_n "checking for T1_StrError in -lt1... " >&6; } -if test "${ac_cv_lib_t1_T1_StrError+set}" = set; then : +if ${ac_cv_lib_t1_T1_StrError+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -41596,7 +41662,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_t1_T1_StrError" >&5 $as_echo "$ac_cv_lib_t1_T1_StrError" >&6; } -if test "x$ac_cv_lib_t1_T1_StrError" = x""yes; then : +if test "x$ac_cv_lib_t1_T1_StrError" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -41740,7 +41806,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_t1_T1_StrError - as_fn_error "Problem with libt1.(a|so). Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Problem with libt1.(a|so). Please check config.log for more information." "$LINENO" 5 fi @@ -41753,7 +41819,7 @@ fi done if test -z "$GD_INCLUDE"; then - as_fn_error "Unable to find gd.h anywhere under $PHP_GD" "$LINENO" 5 + as_fn_error $? "Unable to find gd.h anywhere under $PHP_GD" "$LINENO" 5 fi @@ -41856,7 +41922,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdSetErrorMethod in -lgd" >&5 $as_echo_n "checking for gdSetErrorMethod in -lgd... " >&6; } -if test "${ac_cv_lib_gd_gdSetErrorMethod+set}" = set; then : +if ${ac_cv_lib_gd_gdSetErrorMethod+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -41890,7 +41956,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdSetErrorMethod" >&5 $as_echo "$ac_cv_lib_gd_gdSetErrorMethod" >&6; } -if test "x$ac_cv_lib_gd_gdSetErrorMethod" = x""yes; then : +if test "x$ac_cv_lib_gd_gdSetErrorMethod" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -42003,7 +42069,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdSetErrorMethod - as_fn_error "Unable to find libgd.(a|so) >= 2.1.0 anywhere under $PHP_GD" "$LINENO" 5 + as_fn_error $? "Unable to find libgd.(a|so) >= 2.1.0 anywhere under $PHP_GD" "$LINENO" 5 fi @@ -42106,7 +42172,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromPng in -lgd" >&5 $as_echo_n "checking for gdImageCreateFromPng in -lgd... " >&6; } -if test "${ac_cv_lib_gd_gdImageCreateFromPng+set}" = set; then : +if ${ac_cv_lib_gd_gdImageCreateFromPng+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -42140,7 +42206,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateFromPng" >&5 $as_echo "$ac_cv_lib_gd_gdImageCreateFromPng" >&6; } -if test "x$ac_cv_lib_gd_gdImageCreateFromPng" = x""yes; then : +if test "x$ac_cv_lib_gd_gdImageCreateFromPng" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -42254,7 +42320,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromWebp in -lgd" >&5 $as_echo_n "checking for gdImageCreateFromWebp in -lgd... " >&6; } -if test "${ac_cv_lib_gd_gdImageCreateFromWebp+set}" = set; then : +if ${ac_cv_lib_gd_gdImageCreateFromWebp+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -42288,7 +42354,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateFromWebp" >&5 $as_echo "$ac_cv_lib_gd_gdImageCreateFromWebp" >&6; } -if test "x$ac_cv_lib_gd_gdImageCreateFromWebp" = x""yes; then : +if test "x$ac_cv_lib_gd_gdImageCreateFromWebp" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -42402,7 +42468,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromJpeg in -lgd" >&5 $as_echo_n "checking for gdImageCreateFromJpeg in -lgd... " >&6; } -if test "${ac_cv_lib_gd_gdImageCreateFromJpeg+set}" = set; then : +if ${ac_cv_lib_gd_gdImageCreateFromJpeg+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -42436,7 +42502,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateFromJpeg" >&5 $as_echo "$ac_cv_lib_gd_gdImageCreateFromJpeg" >&6; } -if test "x$ac_cv_lib_gd_gdImageCreateFromJpeg" = x""yes; then : +if test "x$ac_cv_lib_gd_gdImageCreateFromJpeg" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -42550,7 +42616,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromXpm in -lgd" >&5 $as_echo_n "checking for gdImageCreateFromXpm in -lgd... " >&6; } -if test "${ac_cv_lib_gd_gdImageCreateFromXpm+set}" = set; then : +if ${ac_cv_lib_gd_gdImageCreateFromXpm+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -42584,7 +42650,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateFromXpm" >&5 $as_echo "$ac_cv_lib_gd_gdImageCreateFromXpm" >&6; } -if test "x$ac_cv_lib_gd_gdImageCreateFromXpm" = x""yes; then : +if test "x$ac_cv_lib_gd_gdImageCreateFromXpm" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -42698,7 +42764,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageStringFT in -lgd" >&5 $as_echo_n "checking for gdImageStringFT in -lgd... " >&6; } -if test "${ac_cv_lib_gd_gdImageStringFT+set}" = set; then : +if ${ac_cv_lib_gd_gdImageStringFT+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -42732,7 +42798,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageStringFT" >&5 $as_echo "$ac_cv_lib_gd_gdImageStringFT" >&6; } -if test "x$ac_cv_lib_gd_gdImageStringFT" = x""yes; then : +if test "x$ac_cv_lib_gd_gdImageStringFT" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -43097,7 +43163,7 @@ else LIBS=$old_LIBS - as_fn_error "GD build test failed. Please check the config.log for details." "$LINENO" 5 + as_fn_error $? "GD build test failed. Please check the config.log for details." "$LINENO" 5 fi @@ -43237,7 +43303,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreate in -lgd" >&5 $as_echo_n "checking for gdImageCreate in -lgd... " >&6; } -if test "${ac_cv_lib_gd_gdImageCreate+set}" = set; then : +if ${ac_cv_lib_gd_gdImageCreate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -43271,7 +43337,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreate" >&5 $as_echo "$ac_cv_lib_gd_gdImageCreate" >&6; } -if test "x$ac_cv_lib_gd_gdImageCreate" = x""yes; then : +if test "x$ac_cv_lib_gd_gdImageCreate" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -43283,7 +43349,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageCreate - as_fn_error "GD build test failed. Please check the config.log for details." "$LINENO" 5 + as_fn_error $? "GD build test failed. Please check the config.log for details." "$LINENO" 5 fi @@ -43368,7 +43434,7 @@ if test "$PHP_GETTEXT" != "no"; then done if test -z "$GETTEXT_DIR"; then - as_fn_error "Cannot locate header file libintl.h" "$LINENO" 5 + as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5 fi GETTEXT_LIBDIR=$GETTEXT_DIR/$PHP_LIBDIR @@ -43378,7 +43444,7 @@ if test "$PHP_GETTEXT" != "no"; then LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; } -if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : +if ${ac_cv_lib_intl_bindtextdomain+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -43412,7 +43478,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } -if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : +if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then : GETTEXT_LIBS=intl GETTEXT_CHECK_IN_LIB=intl @@ -43420,7 +43486,7 @@ if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lc" >&5 $as_echo_n "checking for bindtextdomain in -lc... " >&6; } -if test "${ac_cv_lib_c_bindtextdomain+set}" = set; then : +if ${ac_cv_lib_c_bindtextdomain+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -43454,14 +43520,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_bindtextdomain" >&5 $as_echo "$ac_cv_lib_c_bindtextdomain" >&6; } -if test "x$ac_cv_lib_c_bindtextdomain" = x""yes; then : +if test "x$ac_cv_lib_c_bindtextdomain" = xyes; then : GETTEXT_LIBS= GETTEXT_CHECK_IN_LIB=c else - as_fn_error "Unable to find required gettext library" "$LINENO" 5 + as_fn_error $? "Unable to find required gettext library" "$LINENO" 5 fi @@ -43905,7 +43971,7 @@ EOF as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_ngettext" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 $as_echo_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -43940,8 +44006,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : $as_echo "#define HAVE_NGETTEXT 1" >>confdefs.h @@ -43950,7 +44015,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_dngettext" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 $as_echo_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -43985,8 +44050,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : $as_echo "#define HAVE_DNGETTEXT 1" >>confdefs.h @@ -43995,7 +44059,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_dcngettext" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 $as_echo_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -44030,8 +44094,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : $as_echo "#define HAVE_DCNGETTEXT 1" >>confdefs.h @@ -44040,7 +44103,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_bind_textdomain_codeset" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 $as_echo_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -44075,8 +44138,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : $as_echo "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h @@ -44138,7 +44200,7 @@ if test "$PHP_GMP" != "no"; then done if test -z "$GMP_DIR"; then - as_fn_error "Unable to locate gmp.h" "$LINENO" 5 + as_fn_error $? "Unable to locate gmp.h" "$LINENO" 5 fi @@ -44240,7 +44302,7 @@ if test "$PHP_GMP" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 $as_echo_n "checking for __gmp_randinit_lc_2exp_size in -lgmp... " >&6; } -if test "${ac_cv_lib_gmp___gmp_randinit_lc_2exp_size+set}" = set; then : +if ${ac_cv_lib_gmp___gmp_randinit_lc_2exp_size+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -44274,7 +44336,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmp_randinit_lc_2exp_size" >&5 $as_echo "$ac_cv_lib_gmp___gmp_randinit_lc_2exp_size" >&6; } -if test "x$ac_cv_lib_gmp___gmp_randinit_lc_2exp_size" = x""yes; then : +if test "x$ac_cv_lib_gmp___gmp_randinit_lc_2exp_size" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -44385,7 +44447,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 $as_echo_n "checking for gmp_randinit_lc_2exp_size in -lgmp... " >&6; } -if test "${ac_cv_lib_gmp_gmp_randinit_lc_2exp_size+set}" = set; then : +if ${ac_cv_lib_gmp_gmp_randinit_lc_2exp_size+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -44419,7 +44481,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp_gmp_randinit_lc_2exp_size" >&5 $as_echo "$ac_cv_lib_gmp_gmp_randinit_lc_2exp_size" >&6; } -if test "x$ac_cv_lib_gmp_gmp_randinit_lc_2exp_size" = x""yes; then : +if test "x$ac_cv_lib_gmp_gmp_randinit_lc_2exp_size" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -44431,7 +44493,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_gmp_gmp_randinit_lc_2exp_size - as_fn_error "GNU MP Library version 4.1.2 or greater required." "$LINENO" 5 + as_fn_error $? "GNU MP Library version 4.1.2 or greater required." "$LINENO" 5 fi @@ -44978,7 +45040,7 @@ $as_echo "#define HAVE_HASH_EXT 1" >>confdefs.h { $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_php+set}" = set; then : +if ${ac_cv_c_bigendian_php+:} false; then : $as_echo_n "(cached) " >&6 else @@ -45028,7 +45090,7 @@ $as_echo "#define WORDS_BIGENDIAN /**/" >>confdefs.h # 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 : @@ -45037,9 +45099,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 @@ -45062,7 +45123,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 : @@ -45071,9 +45132,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 @@ -45096,7 +45156,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 : @@ -45105,9 +45165,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 @@ -45130,7 +45189,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 : @@ -45139,9 +45198,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 @@ -45554,14 +45612,14 @@ if test "$PHP_ICONV" != "no"; then LIBS_save="$LIBS" LIBS= ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv" -if test "x$ac_cv_func_iconv" = x""yes; then : +if test "x$ac_cv_func_iconv" = xyes; then : found_iconv=yes else ac_fn_c_check_func "$LINENO" "libiconv" "ac_cv_func_libiconv" -if test "x$ac_cv_func_libiconv" = x""yes; then : +if test "x$ac_cv_func_libiconv" = xyes; then : echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h @@ -45597,7 +45655,7 @@ $as_echo "#define HAVE_GICONV_H 1" >>confdefs.h done if test -z "$ICONV_DIR"; then - as_fn_error "Please specify the install prefix of iconv with --with-iconv=<DIR>" "$LINENO" 5 + as_fn_error $? "Please specify the install prefix of iconv with --with-iconv=<DIR>" "$LINENO" 5 fi if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || @@ -45703,7 +45761,7 @@ $as_echo "#define HAVE_GICONV_H 1" >>confdefs.h as_ac_Lib=`$as_echo "ac_cv_lib_$iconv_lib_name''_libiconv" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv in -l$iconv_lib_name" >&5 $as_echo_n "checking for libiconv in -l$iconv_lib_name... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -45738,8 +45796,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -45865,7 +45922,7 @@ else as_ac_Lib=`$as_echo "ac_cv_lib_$iconv_lib_name''_iconv" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv in -l$iconv_lib_name" >&5 $as_echo_n "checking for iconv in -l$iconv_lib_name... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -45900,8 +45957,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -46802,7 +46858,7 @@ EOF else - as_fn_error "Please reinstall the iconv library." "$LINENO" 5 + as_fn_error $? "Please reinstall the iconv library." "$LINENO" 5 fi fi @@ -47309,7 +47365,7 @@ rm -f conftest* CFLAGS="-I$IMAP_INC_DIR" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8_mime2text signature" >&5 $as_echo_n "checking for utf8_mime2text signature... " >&6; } -if test "${ac_cv_utf8_mime2text+set}" = set; then : +if ${ac_cv_utf8_mime2text+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -47354,7 +47410,7 @@ $as_echo "#define HAVE_NEW_MIME2TEXT 1" >>confdefs.h CFLAGS="-I$IMAP_INC_DIR" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for U8T_DECOMPOSE" >&5 $as_echo_n "checking for U8T_DECOMPOSE... " >&6; } -if test "${ac_cv_u8t_canonical+set}" = set; then : +if ${ac_cv_u8t_canonical+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -47389,10 +47445,10 @@ $as_echo "$ac_cv_u8t_canonical" >&6; } CFLAGS=$old_CFLAGS if test "$ac_cv_u8t_decompose" = "no" && test "$ac_cv_utf8_mime2text" = "new"; then - as_fn_error "utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information." "$LINENO" 5 + as_fn_error $? "utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information." "$LINENO" 5 fi if test "$ac_cv_u8t_decompose" = "yes" && test "$ac_cv_utf8_mime2text" = "old"; then - as_fn_error "utf8_mime2text() has old signature, but U8T_CANONICAL is present. This should not happen. Check config.log for additional information." "$LINENO" 5 + as_fn_error $? "utf8_mime2text() has old signature, but U8T_CANONICAL is present. This should not happen. Check config.log for additional information." "$LINENO" 5 fi old_CPPFLAGS=$CPPFLAGS @@ -47515,7 +47571,7 @@ rm -f conftest* { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5 $as_echo_n "checking for pam_start in -lpam... " >&6; } -if test "${ac_cv_lib_pam_pam_start+set}" = set; then : +if ${ac_cv_lib_pam_pam_start+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -47549,7 +47605,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5 $as_echo "$ac_cv_lib_pam_pam_start" >&6; } -if test "x$ac_cv_lib_pam_pam_start" = x""yes; then : +if test "x$ac_cv_lib_pam_pam_start" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -47689,7 +47745,7 @@ fi { $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 @@ -47723,7 +47779,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 : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -47779,12 +47835,12 @@ fi if test -z "$IMAP_DIR"; then - as_fn_error "Cannot find rfc822.h. Please check your c-client installation." "$LINENO" 5 + as_fn_error $? "Cannot find rfc822.h. Please check your c-client installation." "$LINENO" 5 fi - if test -r "$IMAP_DIR/c-client/c-client.a"; then + if test ! -r "$IMAP_DIR/c-client/libc-client.a" && -r "$IMAP_DIR/c-client/c-client.a" ; then ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 - elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then + elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1 fi @@ -47805,7 +47861,7 @@ fi done if test -z "$IMAP_LIBDIR"; then - as_fn_error "Cannot find imap library (libc-client.a). Please check your c-client installation." "$LINENO" 5 + as_fn_error $? "Cannot find imap library (libc-client.a). Please check your c-client installation." "$LINENO" 5 fi @@ -47912,7 +47968,7 @@ fi set dummy krb5-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_path_KRB5_CONFIG+set}" = set; then : +if ${ac_cv_path_KRB5_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $KRB5_CONFIG in @@ -47927,7 +47983,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -48276,7 +48332,7 @@ $as_echo "#define HAVE_IMAP_KRB 1" >>confdefs.h else - as_fn_error "Kerberos libraries not found. + as_fn_error $? "Kerberos libraries not found. Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr ) " "$LINENO" 5 @@ -48292,7 +48348,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "auth_gss" >/dev/null 2>&1; then : - as_fn_error "This c-client library is built with Kerberos support. + as_fn_error $? "This c-client library is built with Kerberos support. Add --with-kerberos to your configure line. Check config.log for details. " "$LINENO" 5 @@ -48326,7 +48382,7 @@ rm -f conftest* set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -48340,7 +48396,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -48372,7 +48428,7 @@ fi OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` else - as_fn_error "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 fi if test -n "$OPENSSL_LIBS"; then @@ -48527,11 +48583,11 @@ fi done if test -z "$OPENSSL_INCDIR"; then - as_fn_error "Cannot find OpenSSL's <evp.h>" "$LINENO" 5 + as_fn_error $? "Cannot find OpenSSL's <evp.h>" "$LINENO" 5 fi if test -z "$OPENSSL_LIBDIR"; then - as_fn_error "Cannot find OpenSSL's libraries" "$LINENO" 5 + as_fn_error $? "Cannot find OpenSSL's libraries" "$LINENO" 5 fi old_CPPFLAGS=$CPPFLAGS @@ -48555,7 +48611,7 @@ $as_echo ">= 0.9.6" >&6; } else - as_fn_error "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 fi rm -f conftest* @@ -48693,7 +48749,7 @@ rm -f conftest* { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_free in -lcrypto" >&5 $as_echo_n "checking for CRYPTO_free in -lcrypto... " >&6; } -if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then : +if ${ac_cv_lib_crypto_CRYPTO_free+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -48727,7 +48783,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_CRYPTO_free" >&5 $as_echo "$ac_cv_lib_crypto_CRYPTO_free" >&6; } -if test "x$ac_cv_lib_crypto_CRYPTO_free" = x""yes; then : +if test "x$ac_cv_lib_crypto_CRYPTO_free" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -48763,7 +48819,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_crypto_CRYPTO_free - as_fn_error "libcrypto not found!" "$LINENO" 5 + as_fn_error $? "libcrypto not found!" "$LINENO" 5 fi @@ -48870,7 +48926,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_ssl_version in -lssl" >&5 $as_echo_n "checking for SSL_CTX_set_ssl_version in -lssl... " >&6; } -if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then : +if ${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -48904,7 +48960,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5 $as_echo "$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6; } -if test "x$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" = x""yes; then : +if test "x$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -48918,7 +48974,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version - as_fn_error "libssl not found!" "$LINENO" 5 + as_fn_error $? "libssl not found!" "$LINENO" 5 fi @@ -49021,7 +49077,7 @@ $as_echo "#define HAVE_IMAP_SSL 1" >>confdefs.h else - as_fn_error "OpenSSL libraries not found. + as_fn_error $? "OpenSSL libraries not found. Check the path given to --with-openssl-dir and output in config.log) " "$LINENO" 5 @@ -49037,7 +49093,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "ssl_onceonlyinit" >/dev/null 2>&1; then : - as_fn_error "This c-client library is built with SSL support. + as_fn_error $? "This c-client library is built with SSL support. Add --with-imap-ssl to your configure line. Check config.log for details. " "$LINENO" 5 @@ -49310,7 +49366,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "build test failed. Please check the config.log for details." "$LINENO" 5 + as_fn_error $? "build test failed. Please check the config.log for details." "$LINENO" 5 fi @@ -49476,7 +49532,7 @@ if test "$PHP_INTERBASE" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lfbclient" >&5 $as_echo_n "checking for isc_detach_database in -lfbclient... " >&6; } -if test "${ac_cv_lib_fbclient_isc_detach_database+set}" = set; then : +if ${ac_cv_lib_fbclient_isc_detach_database+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -49510,7 +49566,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fbclient_isc_detach_database" >&5 $as_echo "$ac_cv_lib_fbclient_isc_detach_database" >&6; } -if test "x$ac_cv_lib_fbclient_isc_detach_database" = x""yes; then : +if test "x$ac_cv_lib_fbclient_isc_detach_database" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -49623,7 +49679,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lgds" >&5 $as_echo_n "checking for isc_detach_database in -lgds... " >&6; } -if test "${ac_cv_lib_gds_isc_detach_database+set}" = set; then : +if ${ac_cv_lib_gds_isc_detach_database+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -49657,7 +49713,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gds_isc_detach_database" >&5 $as_echo "$ac_cv_lib_gds_isc_detach_database" >&6; } -if test "x$ac_cv_lib_gds_isc_detach_database" = x""yes; then : +if test "x$ac_cv_lib_gds_isc_detach_database" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -49770,7 +49826,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lib_util" >&5 $as_echo_n "checking for isc_detach_database in -lib_util... " >&6; } -if test "${ac_cv_lib_ib_util_isc_detach_database+set}" = set; then : +if ${ac_cv_lib_ib_util_isc_detach_database+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -49804,7 +49860,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ib_util_isc_detach_database" >&5 $as_echo "$ac_cv_lib_ib_util_isc_detach_database" >&6; } -if test "x$ac_cv_lib_ib_util_isc_detach_database" = x""yes; then : +if test "x$ac_cv_lib_ib_util_isc_detach_database" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -49818,7 +49874,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_ib_util_isc_detach_database - as_fn_error "libgds, libib_util or libfbclient not found! Check config.log for more information." "$LINENO" 5 + as_fn_error $? "libgds, libib_util or libfbclient not found! Check config.log for more information." "$LINENO" 5 fi @@ -50339,7 +50395,7 @@ ext_output=$PHP_ICU_DIR set dummy icu-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_path_ICU_CONFIG+set}" = set; then : +if ${ac_cv_path_ICU_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ICU_CONFIG in @@ -50354,7 +50410,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ICU_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -50388,7 +50444,7 @@ $as_echo_n "checking for location of ICU headers and libraries... " >&6; } if test "$?" != "0" || test -z "$icu_install_prefix"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - as_fn_error "Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works." "$LINENO" 5 + as_fn_error $? "Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $icu_install_prefix" >&5 $as_echo "$icu_install_prefix" >&6; } @@ -50405,7 +50461,7 @@ $as_echo_n "checking for ICU 4.0 or greater... " >&6; } $as_echo "found $icu_version_full" >&6; } if test "$icu_version" -lt "4000"; then - as_fn_error "ICU version 4.0 or later is required" "$LINENO" 5 + as_fn_error $? "ICU version 4.0 or later is required" "$LINENO" 5 fi ICU_VERSION=$icu_version @@ -50563,7 +50619,7 @@ if test -z "$CXX"; 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_CXX+set}" = set; then : +if ${ac_cv_prog_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then @@ -50575,7 +50631,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -50607,7 +50663,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_CXX+set}" = set; then : +if ${ac_cv_prog_ac_ct_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then @@ -50619,7 +50675,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -50685,7 +50741,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_cxx_compiler_gnu+set}" = set; then : +if ${ac_cv_cxx_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -50722,7 +50778,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 $as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then : +if ${ac_cv_prog_cxx_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag @@ -50812,7 +50868,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then : + if ${ac_cv_prog_CXXCPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CXXCPP needs to be expanded @@ -50842,7 +50898,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. @@ -50858,11 +50914,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 @@ -50901,7 +50957,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. @@ -50917,18 +50973,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 \"$CXXCPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -51656,7 +51712,7 @@ $as_echo "#define HAVE_JSON 1 " >>confdefs.h { $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 @@ -52492,7 +52548,7 @@ EOF fi if test -z "$LDAP_DIR"; then - as_fn_error "Cannot find ldap.h" "$LINENO" 5 + as_fn_error $? "Cannot find ldap.h" "$LINENO" 5 fi @@ -54429,7 +54485,7 @@ $as_echo "#define HAVE_ORALDAP_10 1" >>confdefs.h fi else - as_fn_error "Cannot find ldap libraries in $LDAP_LIBDIR." "$LINENO" 5 + as_fn_error $? "Cannot find ldap libraries in $LDAP_LIBDIR." "$LINENO" 5 fi @@ -54477,7 +54533,7 @@ $as_echo "#define HAVE_LDAP 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 3 arg ldap_set_rebind_proc" >&5 $as_echo_n "checking for 3 arg ldap_set_rebind_proc... " >&6; } -if test "${ac_cv_3arg_setrebindproc+set}" = set; then : +if ${ac_cv_3arg_setrebindproc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -54510,8 +54566,7 @@ $as_echo "#define HAVE_3ARG_SETREBINDPROC 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 @@ -54548,7 +54603,7 @@ $as_echo "#define HAVE_LDAP_SASL_H 1" >>confdefs.h LDAP_SASL_INCDIR=$LDAP_SASL_DIR/include LDAP_SASL_LIBDIR=$LDAP_SASL_DIR/$PHP_LIBDIR else - as_fn_error "sasl.h not found!" "$LINENO" 5 + as_fn_error $? "sasl.h not found!" "$LINENO" 5 fi if test "$PHP_LDAP_SASL" = "yes"; then @@ -54656,7 +54711,7 @@ $as_echo "#define HAVE_LDAP_SASL_H 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_version in -lsasl2" >&5 $as_echo_n "checking for sasl_version in -lsasl2... " >&6; } -if test "${ac_cv_lib_sasl2_sasl_version+set}" = set; then : +if ${ac_cv_lib_sasl2_sasl_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -54690,7 +54745,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_sasl_version" >&5 $as_echo "$ac_cv_lib_sasl2_sasl_version" >&6; } -if test "x$ac_cv_lib_sasl2_sasl_version" = x""yes; then : +if test "x$ac_cv_lib_sasl2_sasl_version" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -54834,7 +54889,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_sasl2_sasl_version - as_fn_error "LDAP SASL check failed. Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "LDAP SASL check failed. Please check config.log for more information." "$LINENO" 5 fi @@ -54843,11 +54898,11 @@ fi fi ac_fn_c_check_func "$LINENO" "ldap_bind_s" "ac_cv_func_ldap_bind_s" -if test "x$ac_cv_func_ldap_bind_s" = x""yes; then : +if test "x$ac_cv_func_ldap_bind_s" = xyes; then : else - as_fn_error "LDAP build check failed. Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "LDAP build check failed. Please check config.log for more information." "$LINENO" 5 fi @@ -55037,7 +55092,7 @@ $as_echo "#define USE_COMBINATION_EXPLOSION_CHECK 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for variable length prototypes and stdarg.h" >&5 $as_echo_n "checking for variable length prototypes and stdarg.h... " >&6; } -if test "${php_cv_mbstring_stdarg+set}" = set; then : +if ${php_cv_mbstring_stdarg+:} false; then : $as_echo_n "(cached) " >&6 else @@ -55086,8 +55141,7 @@ $as_echo "$php_cv_mbstring_stdarg" >&6; } 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 @@ -55102,7 +55156,7 @@ done # 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 : @@ -55111,9 +55165,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 @@ -55136,7 +55189,7 @@ _ACEOF # 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 : @@ -55145,9 +55198,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 @@ -55170,7 +55222,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 : @@ -55179,9 +55231,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 @@ -55200,7 +55251,7 @@ _ACEOF { $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 @@ -55209,11 +55260,11 @@ else int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -55230,8 +55281,9 @@ main () ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -55247,10 +55299,10 @@ main () iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -55280,7 +55332,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 @@ -55317,7 +55369,7 @@ fi # for constant arguments. Useless! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 $as_echo_n "checking for working alloca.h... " >&6; } -if test "${ac_cv_working_alloca_h+set}" = set; then : +if ${ac_cv_working_alloca_h+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -55350,7 +55402,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 $as_echo_n "checking for alloca... " >&6; } -if test "${ac_cv_func_alloca_works+set}" = set; then : +if ${ac_cv_func_alloca_works+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -55369,7 +55421,7 @@ else #pragma alloca # else # ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); +void *alloca (size_t); # endif # endif # endif @@ -55413,7 +55465,7 @@ $as_echo "#define C_ALLOCA 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -if test "${ac_cv_os_cray+set}" = set; then : +if ${ac_cv_os_cray+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -55440,8 +55492,7 @@ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; 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 CRAY_STACKSEG_END $ac_func @@ -55455,7 +55506,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 $as_echo_n "checking stack direction for C alloca... " >&6; } -if test "${ac_cv_c_stack_direction+set}" = set; then : +if ${ac_cv_c_stack_direction+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -55465,23 +55516,20 @@ else /* end confdefs.h. */ $ac_includes_default int -find_stack_direction () +find_stack_direction (int *addr, int depth) { - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; + int dir, dummy = 0; + if (! addr) + addr = &dummy; + *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1; + dir = depth ? find_stack_direction (addr, depth - 1) : 0; + return dir + dummy; } int -main () +main (int argc, char **argv) { - return find_stack_direction () < 0; + return find_stack_direction (0, argc + !argv + 20) < 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : @@ -55505,7 +55553,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 : @@ -55566,7 +55614,7 @@ esac ac_fn_c_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default" -if test "x$ac_cv_header_stdarg_h" = x""yes; then : +if test "x$ac_cv_header_stdarg_h" = xyes; then : $as_echo "#define HAVE_STDARG_PROTOTYPES 1" >>confdefs.h @@ -55645,7 +55693,7 @@ $as_echo "#define HAVE_ONIG 1" >>confdefs.h else if test ! -f "$PHP_ONIG/include/oniguruma.h"; then - as_fn_error "oniguruma.h not found in $PHP_ONIG/include" "$LINENO" 5 + as_fn_error $? "oniguruma.h not found in $PHP_ONIG/include" "$LINENO" 5 fi if test "$PHP_ONIG/include" != "/usr/include"; then @@ -55778,7 +55826,7 @@ $as_echo "#define HAVE_ONIG 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for onig_init in -lonig" >&5 $as_echo_n "checking for onig_init in -lonig... " >&6; } -if test "${ac_cv_lib_onig_onig_init+set}" = set; then : +if ${ac_cv_lib_onig_onig_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -55812,7 +55860,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_onig_onig_init" >&5 $as_echo "$ac_cv_lib_onig_onig_init" >&6; } -if test "x$ac_cv_lib_onig_onig_init" = x""yes; then : +if test "x$ac_cv_lib_onig_onig_init" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -55925,7 +55973,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_onig_onig_init - as_fn_error "Problem with oniguruma. Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Problem with oniguruma. Please check config.log for more information." "$LINENO" 5 fi @@ -56208,7 +56256,7 @@ $as_echo "#define HAVE_MBREGEX 1" >>confdefs.h done if test -z "$PHP_LIBMBFL_INCLUDE"; then - as_fn_error "mbfilter.h not found. Please reinstall libmbfl library." "$LINENO" 5 + as_fn_error $? "mbfilter.h not found. Please reinstall libmbfl library." "$LINENO" 5 else if test "$PHP_LIBMBFL_INCLUDE" != "/usr/include"; then @@ -56342,7 +56390,7 @@ $as_echo "#define HAVE_MBREGEX 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbfl_buffer_converter_new in -lmbfl" >&5 $as_echo_n "checking for mbfl_buffer_converter_new in -lmbfl... " >&6; } -if test "${ac_cv_lib_mbfl_mbfl_buffer_converter_new+set}" = set; then : +if ${ac_cv_lib_mbfl_mbfl_buffer_converter_new+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -56376,7 +56424,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mbfl_mbfl_buffer_converter_new" >&5 $as_echo "$ac_cv_lib_mbfl_mbfl_buffer_converter_new" >&6; } -if test "x$ac_cv_lib_mbfl_mbfl_buffer_converter_new" = x""yes; then : +if test "x$ac_cv_lib_mbfl_mbfl_buffer_converter_new" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -56486,7 +56534,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_mbfl_mbfl_buffer_converter_new - as_fn_error "Problem with libmbfl. Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Problem with libmbfl. Please check config.log for more information." "$LINENO" 5 fi @@ -57046,7 +57094,7 @@ if test "$PHP_MCRYPT" != "no"; then done if test -z "$MCRYPT_DIR"; then - as_fn_error "mcrypt.h not found. Please reinstall libmcrypt." "$LINENO" 5 + as_fn_error $? "mcrypt.h not found. Please reinstall libmcrypt." "$LINENO" 5 fi @@ -57071,7 +57119,7 @@ $as_echo ">= 2.5.6" >&6; } else - as_fn_error "libmcrypt version 2.5.6 or greater required." "$LINENO" 5 + as_fn_error $? "libmcrypt version 2.5.6 or greater required." "$LINENO" 5 fi rm -f conftest* @@ -57178,7 +57226,7 @@ rm -f conftest* { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mcrypt_module_open in -lmcrypt" >&5 $as_echo_n "checking for mcrypt_module_open in -lmcrypt... " >&6; } -if test "${ac_cv_lib_mcrypt_mcrypt_module_open+set}" = set; then : +if ${ac_cv_lib_mcrypt_mcrypt_module_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -57212,7 +57260,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mcrypt_mcrypt_module_open" >&5 $as_echo "$ac_cv_lib_mcrypt_mcrypt_module_open" >&6; } -if test "x$ac_cv_lib_mcrypt_mcrypt_module_open" = x""yes; then : +if test "x$ac_cv_lib_mcrypt_mcrypt_module_open" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -57350,7 +57398,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mcrypt_module_open in -lmcrypt" >&5 $as_echo_n "checking for mcrypt_module_open in -lmcrypt... " >&6; } -if test "${ac_cv_lib_mcrypt_mcrypt_module_open+set}" = set; then : +if ${ac_cv_lib_mcrypt_mcrypt_module_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -57384,7 +57432,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mcrypt_mcrypt_module_open" >&5 $as_echo "$ac_cv_lib_mcrypt_mcrypt_module_open" >&6; } -if test "x$ac_cv_lib_mcrypt_mcrypt_module_open" = x""yes; then : +if test "x$ac_cv_lib_mcrypt_mcrypt_module_open" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -57400,7 +57448,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_mcrypt_mcrypt_module_open - as_fn_error "Sorry, I was not able to diagnose which libmcrypt version you have installed." "$LINENO" 5 + as_fn_error $? "Sorry, I was not able to diagnose which libmcrypt version you have installed." "$LINENO" 5 fi @@ -57899,7 +57947,7 @@ if test "$PHP_MSSQL" != "no"; then done if test -z "$FREETDS_INSTALLATION_DIR"; then - as_fn_error "Cannot find FreeTDS in known installation directories" "$LINENO" 5 + as_fn_error $? "Cannot find FreeTDS in known installation directories" "$LINENO" 5 fi elif test "$PHP_MSSQL" != "no"; then @@ -57911,12 +57959,12 @@ if test "$PHP_MSSQL" != "no"; then FREETDS_INSTALLATION_DIR=$PHP_MSSQL FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds else - as_fn_error "Directory $PHP_MSSQL is not a FreeTDS installation directory" "$LINENO" 5 + as_fn_error $? "Directory $PHP_MSSQL is not a FreeTDS installation directory" "$LINENO" 5 fi fi if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then - as_fn_error "Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" "$LINENO" 5 + as_fn_error $? "Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" "$LINENO" 5 fi @@ -58343,7 +58391,7 @@ EOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_addr in -ldnet_stub" >&5 $as_echo_n "checking for dnet_addr in -ldnet_stub... " >&6; } -if test "${ac_cv_lib_dnet_stub_dnet_addr+set}" = set; then : +if ${ac_cv_lib_dnet_stub_dnet_addr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -58377,7 +58425,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_addr" >&5 $as_echo "$ac_cv_lib_dnet_stub_dnet_addr" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_addr" = x""yes; then : +if test "x$ac_cv_lib_dnet_stub_dnet_addr" = xyes; then : if test "$ext_shared" = "yes"; then @@ -58611,7 +58659,7 @@ elif test "$PHP_MYSQL" != "no"; then fi if test -z "$MYSQL_DIR"; then - as_fn_error "Cannot find MySQL header files under $PHP_MYSQL. + as_fn_error $? "Cannot find MySQL header files under $PHP_MYSQL. Note that the MySQL client library is not bundled anymore!" "$LINENO" 5 fi @@ -58666,7 +58714,7 @@ Note that the MySQL client library is not bundled anymore!" "$LINENO" 5 fi if test -z "$MYSQL_LIB_DIR"; then - as_fn_error "Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR. + as_fn_error $? "Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR. Note that the MySQL client library is not bundled anymore!" "$LINENO" 5 fi @@ -58770,7 +58818,7 @@ Note that the MySQL client library is not bundled anymore!" "$LINENO" 5 as_ac_Lib=`$as_echo "ac_cv_lib_$MYSQL_LIBNAME''_mysql_close" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 $as_echo_n "checking for mysql_close in -l$MYSQL_LIBNAME... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -58805,8 +58853,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -59016,7 +59063,7 @@ else as_ac_Lib=`$as_echo "ac_cv_lib_$MYSQL_LIBNAME''_mysql_error" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 $as_echo_n "checking for mysql_error in -l$MYSQL_LIBNAME... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -59051,8 +59098,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -59064,7 +59110,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_$MYSQL_LIBNAME_mysql_error - as_fn_error "mysql configure failed. Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "mysql configure failed. Please check config.log for more information." "$LINENO" 5 fi @@ -59194,7 +59240,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$MYSQL_LIBNAME''_mysql_errno" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 $as_echo_n "checking for mysql_errno in -l$MYSQL_LIBNAME... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -59229,8 +59275,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -59242,7 +59287,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_$MYSQL_LIBNAME_mysql_errno - as_fn_error "Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." "$LINENO" 5 fi @@ -59762,7 +59807,7 @@ EOF is_it_shared=$PHP_MYSQLND_SHARED is_it_enabled=$PHP_MYSQLND if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension mysql to build statically, but it depends on extension mysqlnd, which you've configured to build shared. You either need to build mysql shared or build mysqlnd statically for the @@ -59770,7 +59815,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension mysql, which depends on extension mysqlnd, but you've either not enabled mysqlnd, or have disabled it. " "$LINENO" 5 @@ -59878,7 +59923,7 @@ $as_echo "#define HAVE_EMBEDDED_MYSQLI 1" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: mysql_config not found" >&5 $as_echo "mysql_config not found" >&6; } - as_fn_error "Please reinstall the mysql distribution" "$LINENO" 5 + as_fn_error $? "Please reinstall the mysql distribution" "$LINENO" 5 fi @@ -59981,7 +60026,7 @@ $as_echo "mysql_config not found" >&6; } as_ac_Lib=`$as_echo "ac_cv_lib_$MYSQL_LIB_NAME''_mysql_set_server_option" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 $as_echo_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -60016,8 +60061,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -60252,7 +60296,7 @@ $as_echo "#define HAVE_MYSQLILIB 1" >>confdefs.h as_ac_Lib=`$as_echo "ac_cv_lib_$MYSQL_LIB_NAME''_mysql_set_character_set" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5 $as_echo_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -60287,8 +60331,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -60300,7 +60343,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_set_character_set - as_fn_error "MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries." "$LINENO" 5 + as_fn_error $? "MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries." "$LINENO" 5 fi @@ -60313,7 +60356,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_set_server_option - as_fn_error "wrong mysql library version or lib not found. Check config.log for more information." "$LINENO" 5 + as_fn_error $? "wrong mysql library version or lib not found. Check config.log for more information." "$LINENO" 5 fi @@ -60418,7 +60461,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$MYSQL_LIB_NAME''_mysql_stmt_next_result" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5 $as_echo_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -60453,8 +60496,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -60801,7 +60843,7 @@ EOF is_it_shared=$PHP_MYSQLND_SHARED is_it_enabled=$PHP_MYSQLND if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension mysqli to build statically, but it depends on extension mysqlnd, which you've configured to build shared. You either need to build mysqli shared or build mysqlnd statically for the @@ -60809,7 +60851,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension mysqli, which depends on extension mysqlnd, but you've either not enabled mysqlnd, or have disabled it. " "$LINENO" 5 @@ -60929,7 +60971,7 @@ $as_echo "$ext_output" >&6; } if test "$PHP_OCI8" != "no"; then if test -z "$PHP_OCI8"; then - as_fn_error "Empty parameter value passed to --with-oci8" "$LINENO" 5 + as_fn_error $? "Empty parameter value passed to --with-oci8" "$LINENO" 5 fi @@ -60939,7 +60981,7 @@ $as_echo_n "checking PHP version... " >&6; } tmp_version=$PHP_VERSION if test -z "$tmp_version"; then if test -z "$PHP_CONFIG"; then - as_fn_error "php-config not found" "$LINENO" 5 + as_fn_error $? "php-config not found" "$LINENO" 5 fi php_version=`$PHP_CONFIG --version 2>/dev/null|head -n 1|$PHP_OCI8_SED -e 's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'` else @@ -60947,7 +60989,7 @@ $as_echo_n "checking PHP version... " >&6; } fi if test -z "$php_version"; then - as_fn_error "failed to detect PHP version, please report" "$LINENO" 5 + as_fn_error $? "failed to detect PHP version, please report" "$LINENO" 5 fi ac_IFS=$IFS @@ -60957,9 +60999,9 @@ $as_echo_n "checking PHP version... " >&6; } oci8_php_version=`expr $1 \* 1000000 + $2 \* 1000 + $3` if test "$oci8_php_version" -lt "4003009"; then - as_fn_error "You need at least PHP 4.3.9 to be able to use this version of OCI8. PHP $php_version found" "$LINENO" 5 + as_fn_error $? "You need at least PHP 4.3.9 to be able to use this version of OCI8. PHP $php_version found" "$LINENO" 5 elif test "$oci8_php_version" -ge "6000000"; then - as_fn_error "This version of OCI8 is not compatible with PHP 6 or higher" "$LINENO" 5 + as_fn_error $? "This version of OCI8 is not compatible with PHP 6 or higher" "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_version, ok" >&5 $as_echo "$php_version, ok" >&6; } @@ -60972,7 +61014,7 @@ $as_echo "$php_version, ok" >&6; } # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long int" >&5 $as_echo_n "checking size of long int... " >&6; } -if test "${ac_cv_sizeof_long_int+set}" = set; then : +if ${ac_cv_sizeof_long_int+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long int))" "ac_cv_sizeof_long_int" "$ac_includes_default"; then : @@ -60981,9 +61023,8 @@ else if test "$ac_cv_type_long_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 (long int) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (long int) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_int=0 fi @@ -61062,7 +61103,7 @@ $as_echo "$OCI8_DIR" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking ORACLE_HOME library validity" >&5 $as_echo_n "checking ORACLE_HOME library validity... " >&6; } if test ! -d "$OCI8_DIR"; then - as_fn_error "${OCI8_DIR} is not a directory" "$LINENO" 5 + as_fn_error $? "${OCI8_DIR} is not a directory" "$LINENO" 5 fi if test -d "$OCI8_DIR/lib" && test ! -d "$OCI8_DIR/lib32"; then OCI8_LIB_DIR=lib @@ -61072,9 +61113,9 @@ $as_echo_n "checking ORACLE_HOME library validity... " >&6; } OCI8_LIB_DIR=$PHP_OCI8_OH_LIBDIR else if test -f "$OCI8_DIR/libociei.$SHLIB_SUFFIX_NAME"; then - as_fn_error "Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}" "$LINENO" 5 + as_fn_error $? "Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}" "$LINENO" 5 else - as_fn_error "Oracle library directory not found in ${OCI8_DIR}" "$LINENO" 5 + as_fn_error $? "Oracle library directory not found in ${OCI8_DIR}" "$LINENO" 5 fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_LIB_DIR" >&5 @@ -61423,7 +61464,7 @@ $as_echo_n "checking Oracle library version compatibility... " >&6; } OCI8_ORACLE_VERSION=8.1 fi else - as_fn_error "Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found" "$LINENO" 5 + as_fn_error $? "Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5 $as_echo "$OCI8_ORACLE_VERSION" >&6; } @@ -61431,7 +61472,7 @@ $as_echo "$OCI8_ORACLE_VERSION" >&6; } case $OCI8_ORACLE_VERSION in 7.3|8.0|8.1) - as_fn_error "Oracle client libraries < 9.2 are not supported" "$LINENO" 5 + as_fn_error $? "Oracle client libraries < 9.2 are not supported" "$LINENO" 5 ;; 9.0) @@ -61534,7 +61575,7 @@ $as_echo "$OCI8_ORACLE_VERSION" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIEnvNlsCreate in -lclntsh" >&5 $as_echo_n "checking for OCIEnvNlsCreate in -lclntsh... " >&6; } -if test "${ac_cv_lib_clntsh_OCIEnvNlsCreate+set}" = set; then : +if ${ac_cv_lib_clntsh_OCIEnvNlsCreate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -61568,7 +61609,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5 $as_echo "$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6; } -if test "x$ac_cv_lib_clntsh_OCIEnvNlsCreate" = x""yes; then : +if test "x$ac_cv_lib_clntsh_OCIEnvNlsCreate" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -61582,7 +61623,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_clntsh_OCIEnvNlsCreate - as_fn_error "Oracle client libraries < 9.2 are not supported" "$LINENO" 5 + as_fn_error $? "Oracle client libraries < 9.2 are not supported" "$LINENO" 5 fi @@ -61992,7 +62033,7 @@ $as_echo_n "checking Oracle Instant Client directory... " >&6; } if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | $PHP_OCI8_TAIL1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'` if test -z "$PHP_OCI8_INSTANT_CLIENT"; then - as_fn_error "Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" "$LINENO" 5 + as_fn_error $? "Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" "$LINENO" 5 fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_OCI8_INSTANT_CLIENT" >&5 @@ -62115,7 +62156,7 @@ $as_echo "$OCISDKMANINC" >&6; } OCI8INCDIR=$OCISDKMANINC else - as_fn_error "Oracle Instant Client SDK header files not found" "$LINENO" 5 + as_fn_error $? "Oracle Instant Client SDK header files not found" "$LINENO" 5 fi OCISYSLIBLIST=`echo "$OCI8INCDIR" | $PHP_OCI8_SED -e 's!\(.*\)/include$!\1/demo/sysliblist!'` @@ -62219,11 +62260,11 @@ $as_echo_n "checking Oracle Instant Client library version compatibility... " >& OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2> /dev/null | $PHP_OCI8_TAIL1` if test -f "$OCI8_NNZ" && test -f "$OCI8_LCS"; then if test ! -f "$OCI8_LCS_BASE"; then - as_fn_error "Link from $OCI8_LCS_BASE to $OCI8_LCS_BASE.*.1 not found" "$LINENO" 5 + as_fn_error $? "Link from $OCI8_LCS_BASE to $OCI8_LCS_BASE.*.1 not found" "$LINENO" 5 fi OCI8_ORACLE_VERSION=`echo $OCI8_LCS | $PHP_OCI8_SED -e 's/.*\.\(.*\)\.1$/\1.1/'` else - as_fn_error "Oracle Instant Client libraries libnnz.$SHLIB_SUFFIX_NAME and libclntsh.$SHLIB_SUFFIX_NAME not found" "$LINENO" 5 + as_fn_error $? "Oracle Instant Client libraries libnnz.$SHLIB_SUFFIX_NAME and libclntsh.$SHLIB_SUFFIX_NAME not found" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5 $as_echo "$OCI8_ORACLE_VERSION" >&6; } @@ -62819,7 +62860,7 @@ $as_echo_n "checking for Adabas support... " >&6; } ODBC_INCDIR=$PHP_ADABAS/incl if ! test -f "$ODBC_INCDIR/sqlext.h"; then - as_fn_error "ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" "$LINENO" 5 + as_fn_error $? "ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" "$LINENO" 5 fi @@ -63163,7 +63204,7 @@ $as_echo_n "checking for IBM DB2 support... " >&6; } if ! test -f "$ODBC_INCDIR/sqlcli1.h"; then - as_fn_error "ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" "$LINENO" 5 + as_fn_error $? "ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" "$LINENO" 5 fi @@ -63210,7 +63251,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error " + as_fn_error $? " build test failed. Please check the config.log for details. You need to source your DB2 environment before running PHP configure: # . \$IBM_DB2/db2profile @@ -63620,8 +63661,8 @@ $as_echo_n "checking for a custom ODBC support... " >&6; } $as_echo "#define HAVE_CODBC 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_ouput" >&5 -$as_echo "$ext_ouput" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } fi fi @@ -63672,9 +63713,155 @@ esac if test "$PHP_IODBC" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iODBC support" >&5 $as_echo_n "checking for iODBC support... " >&6; } - if test "$PHP_IODBC" = "yes"; then - PHP_IODBC=/usr/local + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + fi + if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then + + + if test -n "$PHP_IODBC/$PHP_LIBDIR"; then + + if test "$PHP_IODBC/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_IODBC/$PHP_LIBDIR" != "/usr/lib"; then + + if test -z "$PHP_IODBC/$PHP_LIBDIR" || echo "$PHP_IODBC/$PHP_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$PHP_IODBC/$PHP_LIBDIR + else + + ep_dir=`echo $PHP_IODBC/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'` + + ep_realdir=`(cd "$ep_dir" && pwd)` + ai_p="$ep_realdir"/`basename "$PHP_IODBC/$PHP_LIBDIR"` + fi + + + + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" + + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi + + + + fi + + fi + + + case iodbc in + c|c_r|pthread*) ;; + *) + LIBS="-liodbc $LIBS" + ;; + esac + + + + + ODBC_TYPE=iodbc + ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc` + ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc` + ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc` + + for ac_i in $ODBC_INCLUDE; do + case $ac_i in + -I*) + ac_ii=`echo $ac_i|cut -c 3-` + + if test "$ac_ii" != "/usr/include"; then + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii + else + + ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'` + + ep_realdir=`(cd "$ep_dir" && pwd)` + ai_p="$ep_realdir"/`basename "$ac_ii"` + fi + + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "INCLUDEPATH$unique=set" + + if test ""; then + INCLUDES="-I$ai_p $INCLUDES" + else + INCLUDES="$INCLUDES -I$ai_p" + fi + + fi + + fi + + ;; + esac + done + + +$as_echo "#define HAVE_IODBC 1" >>confdefs.h + + +$as_echo "#define HAVE_ODBC2 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } + else + if test "$PHP_IODBC" = "yes"; then + PHP_IODBC=/usr/local + fi if test -n "$PHP_IODBC/$PHP_LIBDIR"; then @@ -63755,18 +63942,19 @@ $as_echo_n "checking for iODBC support... " >&6; } fi - ODBC_TYPE=iodbc - ODBC_INCLUDE=-I$PHP_IODBC/include - ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR - ODBC_LIBS=-liodbc + ODBC_TYPE=iodbc + ODBC_INCLUDE=-I$PHP_IODBC/include + ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR + ODBC_LIBS=-liodbc $as_echo "#define HAVE_IODBC 1" >>confdefs.h $as_echo "#define HAVE_ODBC2 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 $as_echo "$ext_output" >&6; } + fi fi fi @@ -63892,7 +64080,7 @@ $as_echo_n "checking for unixODBC support... " >&6; } ODBC_TYPE=unixODBC if ! test -f "$ODBC_INCDIR/sqlext.h"; then - as_fn_error "ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" "$LINENO" 5 + as_fn_error $? "ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" "$LINENO" 5 fi @@ -64554,7 +64742,7 @@ $as_echo "$ext_output" >&6; } if test "$PHP_OPCACHE" != "no"; then ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect" -if test "x$ac_cv_func_mprotect" = x""yes; then : +if test "x$ac_cv_func_mprotect" = xyes; then : $as_echo "#define HAVE_MPROTECT 1" >>confdefs.h @@ -64973,8 +65161,8 @@ $as_echo_n "checking for known struct flock definition... " >&6; } if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -65013,7 +65201,7 @@ if ac_fn_c_try_run "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 $as_echo "done" >&6; } else - as_fn_error "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5 + as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5 fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -65418,7 +65606,7 @@ if test "$PHP_PCNTL" != "no"; then for ac_func in fork do : ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork" -if test "x$ac_cv_func_fork" = x""yes; then : +if test "x$ac_cv_func_fork" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_FORK 1 _ACEOF @@ -65426,14 +65614,14 @@ _ACEOF $as_echo "#define HAVE_FORK 1" >>confdefs.h else - as_fn_error "pcntl: fork() not supported by this platform" "$LINENO" 5 + as_fn_error $? "pcntl: fork() not supported by this platform" "$LINENO" 5 fi done for ac_func in waitpid do : ac_fn_c_check_func "$LINENO" "waitpid" "ac_cv_func_waitpid" -if test "x$ac_cv_func_waitpid" = x""yes; then : +if test "x$ac_cv_func_waitpid" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_WAITPID 1 _ACEOF @@ -65441,14 +65629,14 @@ _ACEOF $as_echo "#define HAVE_WAITPID 1" >>confdefs.h else - as_fn_error "pcntl: waitpid() not supported by this platform" "$LINENO" 5 + as_fn_error $? "pcntl: waitpid() not supported by this platform" "$LINENO" 5 fi done for ac_func in sigaction do : ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" -if test "x$ac_cv_func_sigaction" = x""yes; then : +if test "x$ac_cv_func_sigaction" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SIGACTION 1 _ACEOF @@ -65456,7 +65644,7 @@ _ACEOF $as_echo "#define HAVE_SIGACTION 1" >>confdefs.h else - as_fn_error "pcntl: sigaction() not supported by this platform" "$LINENO" 5 + as_fn_error $? "pcntl: sigaction() not supported by this platform" "$LINENO" 5 fi done @@ -65464,8 +65652,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 @@ -65831,7 +66018,7 @@ if test "$PHP_PDO" != "no"; then # we're running in an environment that smells like pear, # and the PHP_PEAR_VERSION env var is not set. That implies # that we're running under a slightly broken pear installer - as_fn_error " + as_fn_error $? " PDO requires that you upgrade your PEAR installer tools. Please do so now by running: @@ -65847,7 +66034,7 @@ Once you've upgraded, please re-try your PDO install. if test "$ext_shared" = "yes" ; then case $host_alias in *darwin*) - as_fn_error " + as_fn_error $? " Due to the way that loadable modules work on OSX/Darwin, you need to compile the PDO package statically into the PHP core. @@ -66157,7 +66344,7 @@ EOF is_it_shared=$PHP_SPL_SHARED is_it_enabled=$PHP_SPL if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension pdo to build statically, but it depends on extension spl, which you've configured to build shared. You either need to build pdo shared or build spl statically for the @@ -66165,7 +66352,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension pdo, which depends on extension spl, but you've either not enabled spl, or have disabled it. " "$LINENO" 5 @@ -66254,7 +66441,7 @@ $as_echo "$ext_output" >&6; } if test "$PHP_PDO_DBLIB" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then - as_fn_error "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 + as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 fi if test "$PHP_PDO_DBLIB" = "yes"; then @@ -66272,7 +66459,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then done if test -z "$PDO_FREETDS_INSTALLATION_DIR"; then - as_fn_error "Cannot find FreeTDS in known installation directories" "$LINENO" 5 + as_fn_error $? "Cannot find FreeTDS in known installation directories" "$LINENO" 5 fi elif test "$PHP_PDO_DBLIB" != "no"; then @@ -66284,7 +66471,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds else - as_fn_error "Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" "$LINENO" 5 + as_fn_error $? "Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" "$LINENO" 5 fi fi @@ -66293,7 +66480,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then fi if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then - as_fn_error "Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" "$LINENO" 5 + as_fn_error $? "Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" "$LINENO" 5 fi @@ -66429,7 +66616,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 $as_echo_n "checking for PDO includes... " >&6; } -if test "${pdo_cv_inc_path+set}" = set; then : +if ${pdo_cv_inc_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -66449,7 +66636,7 @@ $as_echo "$pdo_cv_inc_path" >&6; } if test -n "$pdo_cv_inc_path"; then : else -as_fn_error "Cannot find php_pdo_driver.h." "$LINENO" 5 +as_fn_error $? "Cannot find php_pdo_driver.h." "$LINENO" 5 fi @@ -66750,7 +66937,7 @@ EOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_addr in -ldnet_stub" >&5 $as_echo_n "checking for dnet_addr in -ldnet_stub... " >&6; } -if test "${ac_cv_lib_dnet_stub_dnet_addr+set}" = set; then : +if ${ac_cv_lib_dnet_stub_dnet_addr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -66784,7 +66971,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_addr" >&5 $as_echo "$ac_cv_lib_dnet_stub_dnet_addr" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_addr" = x""yes; then : +if test "x$ac_cv_lib_dnet_stub_dnet_addr" = xyes; then : if test "$ext_shared" = "yes"; then @@ -66904,7 +67091,7 @@ $as_echo "#define HAVE_FREETDS 1" >>confdefs.h is_it_shared=$PHP_PDO_SHARED is_it_enabled=$PHP_PDO if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_dblib to build statically, but it depends on extension pdo, which you've configured to build shared. You either need to build pdo_dblib shared or build pdo statically for the @@ -66912,7 +67099,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_dblib, which depends on extension pdo, but you've either not enabled pdo, or have disabled it. " "$LINENO" 5 @@ -66970,7 +67157,7 @@ $as_echo "$ext_output" >&6; } if test "$PHP_PDO_FIREBIRD" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then - as_fn_error "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 + as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 fi if test "$PHP_PDO_FIREBIRD" = "yes"; then @@ -67082,7 +67269,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lfbclient" >&5 $as_echo_n "checking for isc_detach_database in -lfbclient... " >&6; } -if test "${ac_cv_lib_fbclient_isc_detach_database+set}" = set; then : +if ${ac_cv_lib_fbclient_isc_detach_database+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -67116,7 +67303,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fbclient_isc_detach_database" >&5 $as_echo "$ac_cv_lib_fbclient_isc_detach_database" >&6; } -if test "x$ac_cv_lib_fbclient_isc_detach_database" = x""yes; then : +if test "x$ac_cv_lib_fbclient_isc_detach_database" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -67229,7 +67416,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lgds" >&5 $as_echo_n "checking for isc_detach_database in -lgds... " >&6; } -if test "${ac_cv_lib_gds_isc_detach_database+set}" = set; then : +if ${ac_cv_lib_gds_isc_detach_database+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -67263,7 +67450,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gds_isc_detach_database" >&5 $as_echo "$ac_cv_lib_gds_isc_detach_database" >&6; } -if test "x$ac_cv_lib_gds_isc_detach_database" = x""yes; then : +if test "x$ac_cv_lib_gds_isc_detach_database" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -67376,7 +67563,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lib_util" >&5 $as_echo_n "checking for isc_detach_database in -lib_util... " >&6; } -if test "${ac_cv_lib_ib_util_isc_detach_database+set}" = set; then : +if ${ac_cv_lib_ib_util_isc_detach_database+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -67410,7 +67597,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ib_util_isc_detach_database" >&5 $as_echo "$ac_cv_lib_ib_util_isc_detach_database" >&6; } -if test "x$ac_cv_lib_ib_util_isc_detach_database" = x""yes; then : +if test "x$ac_cv_lib_ib_util_isc_detach_database" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -67424,7 +67611,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_ib_util_isc_detach_database - as_fn_error "libfbclient, libgds or libib_util not found! Check config.log for more information." "$LINENO" 5 + as_fn_error $? "libfbclient, libgds or libib_util not found! Check config.log for more information." "$LINENO" 5 fi @@ -67441,7 +67628,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 $as_echo_n "checking for PDO includes... " >&6; } -if test "${pdo_cv_inc_path+set}" = set; then : +if ${pdo_cv_inc_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -67461,7 +67648,7 @@ $as_echo "$pdo_cv_inc_path" >&6; } if test -n "$pdo_cv_inc_path"; then : else -as_fn_error "Cannot find php_pdo_driver.h." "$LINENO" 5 +as_fn_error $? "Cannot find php_pdo_driver.h." "$LINENO" 5 fi @@ -67897,7 +68084,7 @@ EOF is_it_shared=$PHP_PDO_SHARED is_it_enabled=$PHP_PDO if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_firebird to build statically, but it depends on extension pdo, which you've configured to build shared. You either need to build pdo_firebird shared or build pdo statically for the @@ -67905,7 +68092,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_firebird, which depends on extension pdo, but you've either not enabled pdo, or have disabled it. " "$LINENO" 5 @@ -67988,7 +68175,7 @@ fi if test "$PHP_PDO_MYSQL" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then - as_fn_error "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 + as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 fi @@ -68027,7 +68214,7 @@ $as_echo "$PDO_MYSQL_CONFIG" >&6; } set dummy sed; 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_SED+set}" = set; then : +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else case $SED in @@ -68041,7 +68228,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -68094,7 +68281,7 @@ $as_echo "libs under $PDO_MYSQL_LIB_DIR; seems promising" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: can not find it" >&5 $as_echo "can not find it" >&6; } - as_fn_error "Unable to find your mysql installation" "$LINENO" 5 + as_fn_error $? "Unable to find your mysql installation" "$LINENO" 5 fi @@ -68132,7 +68319,7 @@ $as_echo "can not find it" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - as_fn_error "Unable to find your mysql installation" "$LINENO" 5 + as_fn_error $? "Unable to find your mysql installation" "$LINENO" 5 fi @@ -68235,7 +68422,7 @@ $as_echo "not found" >&6; } as_ac_Lib=`$as_echo "ac_cv_lib_$PDO_MYSQL_LIBNAME''_mysql_commit" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_commit in -l$PDO_MYSQL_LIBNAME" >&5 $as_echo_n "checking for mysql_commit in -l$PDO_MYSQL_LIBNAME... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -68270,8 +68457,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -68611,7 +68797,7 @@ else as_ac_Lib=`$as_echo "ac_cv_lib_$PDO_MYSQL_LIBNAME''_mysql_commit" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_commit in -l$PDO_MYSQL_LIBNAME" >&5 $as_echo_n "checking for mysql_commit in -l$PDO_MYSQL_LIBNAME... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -68646,8 +68832,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -68659,7 +68844,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_commit - as_fn_error "PDO_MYSQL configure failed, MySQL 4.1 needed. Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "PDO_MYSQL configure failed, MySQL 4.1 needed. Please check config.log for more information." "$LINENO" 5 fi @@ -68789,7 +68974,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$PDO_MYSQL_LIBNAME''_mysql_query" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 $as_echo_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -68824,8 +69009,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -68837,7 +69021,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query - as_fn_error "Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." "$LINENO" 5 fi @@ -68984,7 +69168,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 $as_echo_n "checking for PDO includes... " >&6; } -if test "${pdo_cv_inc_path+set}" = set; then : +if ${pdo_cv_inc_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -69004,7 +69188,7 @@ $as_echo "$pdo_cv_inc_path" >&6; } if test -n "$pdo_cv_inc_path"; then : else -as_fn_error "Cannot find php_pdo_driver.h." "$LINENO" 5 +as_fn_error $? "Cannot find php_pdo_driver.h." "$LINENO" 5 fi @@ -69317,7 +69501,7 @@ EOF is_it_shared=$PHP_PDO_SHARED is_it_enabled=$PHP_PDO if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_mysql to build statically, but it depends on extension pdo, which you've configured to build shared. You either need to build pdo_mysql shared or build pdo statically for the @@ -69325,7 +69509,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_mysql, which depends on extension pdo, but you've either not enabled pdo, or have disabled it. " "$LINENO" 5 @@ -69337,7 +69521,7 @@ but you've either not enabled pdo, or have disabled it. is_it_shared=$PHP_MYSQLND_SHARED is_it_enabled=$PHP_MYSQLND if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_mysql to build statically, but it depends on extension mysqlnd, which you've configured to build shared. You either need to build pdo_mysql shared or build mysqlnd statically for the @@ -69345,7 +69529,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_mysql, which depends on extension mysqlnd, but you've either not enabled mysqlnd, or have disabled it. " "$LINENO" 5 @@ -69420,7 +69604,7 @@ $as_echo "$ext_output" >&6; } if test "$PHP_PDO_OCI" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then - as_fn_error "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 + as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Install-Dir" >&5 @@ -69436,7 +69620,7 @@ $as_echo "$PHP_PDO_OCI" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if that is sane" >&5 $as_echo_n "checking if that is sane... " >&6; } if test -z "$PDO_OCI_DIR"; then - as_fn_error " + as_fn_error $? " You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME. " "$LINENO" 5 else @@ -69451,7 +69635,7 @@ $as_echo "yes" >&6; } # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long int" >&5 $as_echo_n "checking size of long int... " >&6; } -if test "${ac_cv_sizeof_long_int+set}" = set; then : +if ${ac_cv_sizeof_long_int+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long int))" "ac_cv_sizeof_long_int" "$ac_includes_default"; then : @@ -69460,9 +69644,8 @@ else if test "$ac_cv_type_long_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 (long int) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (long int) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_int=0 fi @@ -69632,7 +69815,7 @@ $as_echo "$PDO_OCI_IC_PREFIX/sdk/include" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" >&5 $as_echo "$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" >&6; } else - as_fn_error "I'm too dumb to figure out where the include dir is in your Instant Client install" "$LINENO" 5 + as_fn_error $? "I'm too dumb to figure out where the include dir is in your Instant Client install" "$LINENO" 5 fi if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME" ; then PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/lib" @@ -69641,7 +69824,7 @@ $as_echo "$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" >&6; } elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.$SHLIB_SUFFIX_NAME" ; then PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX" else - as_fn_error "I'm too dumb to figure out where the libraries are in your Instant Client install" "$LINENO" 5 + as_fn_error $? "I'm too dumb to figure out where the libraries are in your Instant Client install" "$LINENO" 5 fi PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`" else @@ -69652,7 +69835,7 @@ $as_echo "$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" >&6; } # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long int" >&5 $as_echo_n "checking size of long int... " >&6; } -if test "${ac_cv_sizeof_long_int+set}" = set; then : +if ${ac_cv_sizeof_long_int+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long int))" "ac_cv_sizeof_long_int" "$ac_includes_default"; then : @@ -69661,9 +69844,8 @@ else if test "$ac_cv_type_long_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 (long int) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (long int) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_int=0 fi @@ -69701,7 +69883,7 @@ $as_echo_n "checking OCI8 libraries dir... " >&6; } elif test -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then PDO_OCI_LIB_DIR=$TMP_PDO_OCI_LIB_DIR else - as_fn_error "Oracle required OCI8 libraries not found" "$LINENO" 5 + as_fn_error $? "Oracle required OCI8 libraries not found" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_LIB_DIR" >&5 $as_echo "$PDO_OCI_LIB_DIR" >&6; } @@ -70068,7 +70250,7 @@ $as_echo_n "checking Oracle version... " >&6; } fi done if test -z "$PDO_OCI_VERSION"; then - as_fn_error "Oracle required OCI8 libraries not found under $PDO_OCI_DIR" "$LINENO" 5 + as_fn_error $? "Oracle required OCI8 libraries not found under $PDO_OCI_DIR" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_VERSION" >&5 $as_echo "$PDO_OCI_VERSION" >&6; } @@ -70103,7 +70285,7 @@ $as_echo "$PDO_OCI_VERSION" >&6; } ;; *) - as_fn_error "Unsupported Oracle version $PDO_OCI_VERSION" "$LINENO" 5 + as_fn_error $? "Unsupported Oracle version $PDO_OCI_VERSION" "$LINENO" 5 ;; esac @@ -70245,7 +70427,7 @@ $as_echo "$PDO_OCI_VERSION" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIEnvCreate in -lclntsh" >&5 $as_echo_n "checking for OCIEnvCreate in -lclntsh... " >&6; } -if test "${ac_cv_lib_clntsh_OCIEnvCreate+set}" = set; then : +if ${ac_cv_lib_clntsh_OCIEnvCreate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -70279,7 +70461,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvCreate" >&5 $as_echo "$ac_cv_lib_clntsh_OCIEnvCreate" >&6; } -if test "x$ac_cv_lib_clntsh_OCIEnvCreate" = x""yes; then : +if test "x$ac_cv_lib_clntsh_OCIEnvCreate" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -70398,7 +70580,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIEnvNlsCreate in -lclntsh" >&5 $as_echo_n "checking for OCIEnvNlsCreate in -lclntsh... " >&6; } -if test "${ac_cv_lib_clntsh_OCIEnvNlsCreate+set}" = set; then : +if ${ac_cv_lib_clntsh_OCIEnvNlsCreate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -70432,7 +70614,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5 $as_echo "$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6; } -if test "x$ac_cv_lib_clntsh_OCIEnvNlsCreate" = x""yes; then : +if test "x$ac_cv_lib_clntsh_OCIEnvNlsCreate" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -70551,7 +70733,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCILobIsTemporary in -lclntsh" >&5 $as_echo_n "checking for OCILobIsTemporary in -lclntsh... " >&6; } -if test "${ac_cv_lib_clntsh_OCILobIsTemporary+set}" = set; then : +if ${ac_cv_lib_clntsh_OCILobIsTemporary+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -70585,7 +70767,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCILobIsTemporary" >&5 $as_echo "$ac_cv_lib_clntsh_OCILobIsTemporary" >&6; } -if test "x$ac_cv_lib_clntsh_OCILobIsTemporary" = x""yes; then : +if test "x$ac_cv_lib_clntsh_OCILobIsTemporary" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -70700,7 +70882,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCILobIsTemporary in -locijdbc8" >&5 $as_echo_n "checking for OCILobIsTemporary in -locijdbc8... " >&6; } -if test "${ac_cv_lib_ocijdbc8_OCILobIsTemporary+set}" = set; then : +if ${ac_cv_lib_ocijdbc8_OCILobIsTemporary+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -70734,7 +70916,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ocijdbc8_OCILobIsTemporary" >&5 $as_echo "$ac_cv_lib_ocijdbc8_OCILobIsTemporary" >&6; } -if test "x$ac_cv_lib_ocijdbc8_OCILobIsTemporary" = x""yes; then : +if test "x$ac_cv_lib_ocijdbc8_OCILobIsTemporary" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -70880,7 +71062,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCICollAssign in -lclntsh" >&5 $as_echo_n "checking for OCICollAssign in -lclntsh... " >&6; } -if test "${ac_cv_lib_clntsh_OCICollAssign+set}" = set; then : +if ${ac_cv_lib_clntsh_OCICollAssign+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -70914,7 +71096,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCICollAssign" >&5 $as_echo "$ac_cv_lib_clntsh_OCICollAssign" >&6; } -if test "x$ac_cv_lib_clntsh_OCICollAssign" = x""yes; then : +if test "x$ac_cv_lib_clntsh_OCICollAssign" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -71033,7 +71215,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIStmtFetch2 in -lclntsh" >&5 $as_echo_n "checking for OCIStmtFetch2 in -lclntsh... " >&6; } -if test "${ac_cv_lib_clntsh_OCIStmtFetch2+set}" = set; then : +if ${ac_cv_lib_clntsh_OCIStmtFetch2+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -71067,7 +71249,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIStmtFetch2" >&5 $as_echo "$ac_cv_lib_clntsh_OCIStmtFetch2" >&6; } -if test "x$ac_cv_lib_clntsh_OCIStmtFetch2" = x""yes; then : +if test "x$ac_cv_lib_clntsh_OCIStmtFetch2" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -71091,7 +71273,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 $as_echo_n "checking for PDO includes... " >&6; } -if test "${pdo_cv_inc_path+set}" = set; then : +if ${pdo_cv_inc_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -71111,7 +71293,7 @@ $as_echo "$pdo_cv_inc_path" >&6; } if test -n "$pdo_cv_inc_path"; then : else -as_fn_error "Cannot find php_pdo_driver.h." "$LINENO" 5 +as_fn_error $? "Cannot find php_pdo_driver.h." "$LINENO" 5 fi @@ -71435,7 +71617,7 @@ EOF is_it_shared=$PHP_PDO_SHARED is_it_enabled=$PHP_PDO if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_oci to build statically, but it depends on extension pdo, which you've configured to build shared. You either need to build pdo_oci shared or build pdo statically for the @@ -71443,7 +71625,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_oci, which depends on extension pdo, but you've either not enabled pdo, or have disabled it. " "$LINENO" 5 @@ -71513,14 +71695,14 @@ $as_echo "$ext_output" >&6; } if test "$PHP_PDO_ODBC" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then - as_fn_error "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 + as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 $as_echo_n "checking for PDO includes... " >&6; } -if test "${pdo_cv_inc_path+set}" = set; then : +if ${pdo_cv_inc_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -71540,7 +71722,7 @@ $as_echo "$pdo_cv_inc_path" >&6; } if test -n "$pdo_cv_inc_path"; then : else -as_fn_error "Cannot find php_pdo_driver.h." "$LINENO" 5 +as_fn_error $? "Cannot find php_pdo_driver.h." "$LINENO" 5 fi @@ -71588,7 +71770,7 @@ $as_echo_n "checking for selected PDO ODBC flavour... " >&6; } ;; *) - as_fn_error "Unknown ODBC flavour $pdo_odbc_flavour + as_fn_error $? "Unknown ODBC flavour $pdo_odbc_flavour include and lib dirs are looked for under 'dir'. 'flavour' can be one of: ibm-db2, iODBC, unixODBC, generic @@ -71899,7 +72081,7 @@ $as_echo "no" >&6; } if test "$php_pdo_have_header" != "yes"; then - as_fn_error "Cannot find header file(s) for pdo_odbc" "$LINENO" 5 + as_fn_error $? "Cannot find header file(s) for pdo_odbc" "$LINENO" 5 fi PDO_ODBC_INCLUDE="$pdo_odbc_def_cflags -I$PDO_ODBC_INCDIR -DPDO_ODBC_TYPE=\\\"$pdo_odbc_flavour\\\"" @@ -72093,7 +72275,7 @@ $as_echo "no" >&6; } as_ac_Lib=`$as_echo "ac_cv_lib_$pdo_odbc_def_lib''_SQLBindCol" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 $as_echo_n "checking for SQLBindCol in -l$pdo_odbc_def_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -72128,8 +72310,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -72232,7 +72413,7 @@ eval as_val=\$$as_ac_Lib as_ac_Lib=`$as_echo "ac_cv_lib_$pdo_odbc_def_lib''_SQLAllocHandle" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 $as_echo_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -72267,8 +72448,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -72280,7 +72460,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_$pdo_odbc_def_lib_SQLAllocHandle - as_fn_error " + as_fn_error $? " Your ODBC library does not appear to be ODBC 3 compatible. You should consider using iODBC or unixODBC instead, and loading your libraries as a driver in that environment; it will emulate the @@ -72297,7 +72477,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_$pdo_odbc_def_lib_SQLBindCol - as_fn_error "Your ODBC library does not exist or there was an error. Check config.log for more information" "$LINENO" 5 + as_fn_error $? "Your ODBC library does not exist or there was an error. Check config.log for more information" "$LINENO" 5 fi @@ -72605,7 +72785,7 @@ EOF is_it_shared=$PHP_PDO_SHARED is_it_enabled=$PHP_PDO if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_odbc to build statically, but it depends on extension pdo, which you've configured to build shared. You either need to build pdo_odbc shared or build pdo statically for the @@ -72613,7 +72793,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_odbc, which depends on extension pdo, but you've either not enabled pdo, or have disabled it. " "$LINENO" 5 @@ -72671,7 +72851,7 @@ $as_echo "$ext_output" >&6; } if test "$PHP_PDO_PGSQL" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then - as_fn_error "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 + as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 fi @@ -72734,15 +72914,15 @@ $as_echo "#define HAVE_PG_CONFIG_H 1" >>confdefs.h fi if test -z "$PGSQL_INCLUDE"; then - as_fn_error "Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" "$LINENO" 5 + as_fn_error $? "Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" "$LINENO" 5 fi if test -z "$PGSQL_LIBDIR"; then - as_fn_error "Cannot find libpq.so. Please specify correct PostgreSQL installation path" "$LINENO" 5 + as_fn_error $? "Cannot find libpq.so. Please specify correct PostgreSQL installation path" "$LINENO" 5 fi if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then - as_fn_error "Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" "$LINENO" 5 + as_fn_error $? "Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" "$LINENO" 5 fi @@ -72759,7 +72939,7 @@ $as_echo "yes" >&6; } set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -72773,7 +72953,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -72809,7 +72989,7 @@ $as_echo "no" >&6; } LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQparameterStatus in -lpq" >&5 $as_echo_n "checking for PQparameterStatus in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQparameterStatus+set}" = set; then : +if ${ac_cv_lib_pq_PQparameterStatus+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -72843,7 +73023,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQparameterStatus" >&5 $as_echo "$ac_cv_lib_pq_PQparameterStatus" >&6; } -if test "x$ac_cv_lib_pq_PQparameterStatus" = x""yes; then : +if test "x$ac_cv_lib_pq_PQparameterStatus" = xyes; then : $as_echo "#define HAVE_PQPARAMETERSTATUS 1" >>confdefs.h @@ -72857,7 +73037,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQprepare in -lpq" >&5 $as_echo_n "checking for PQprepare in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQprepare+set}" = set; then : +if ${ac_cv_lib_pq_PQprepare+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -72891,7 +73071,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQprepare" >&5 $as_echo "$ac_cv_lib_pq_PQprepare" >&6; } -if test "x$ac_cv_lib_pq_PQprepare" = x""yes; then : +if test "x$ac_cv_lib_pq_PQprepare" = xyes; then : $as_echo "#define HAVE_PQPREPARE 1" >>confdefs.h @@ -72899,7 +73079,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeStringConn in -lpq" >&5 $as_echo_n "checking for PQescapeStringConn in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQescapeStringConn+set}" = set; then : +if ${ac_cv_lib_pq_PQescapeStringConn+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -72933,7 +73113,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeStringConn" >&5 $as_echo "$ac_cv_lib_pq_PQescapeStringConn" >&6; } -if test "x$ac_cv_lib_pq_PQescapeStringConn" = x""yes; then : +if test "x$ac_cv_lib_pq_PQescapeStringConn" = xyes; then : $as_echo "#define HAVE_PQESCAPE_CONN 1" >>confdefs.h @@ -72941,7 +73121,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeByteaConn in -lpq" >&5 $as_echo_n "checking for PQescapeByteaConn in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQescapeByteaConn+set}" = set; then : +if ${ac_cv_lib_pq_PQescapeByteaConn+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -72975,7 +73155,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeByteaConn" >&5 $as_echo "$ac_cv_lib_pq_PQescapeByteaConn" >&6; } -if test "x$ac_cv_lib_pq_PQescapeByteaConn" = x""yes; then : +if test "x$ac_cv_lib_pq_PQescapeByteaConn" = xyes; then : $as_echo "#define HAVE_PQESCAPE_BYTEA_CONN 1" >>confdefs.h @@ -72984,7 +73164,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_encoding_to_char in -lpq" >&5 $as_echo_n "checking for pg_encoding_to_char in -lpq... " >&6; } -if test "${ac_cv_lib_pq_pg_encoding_to_char+set}" = set; then : +if ${ac_cv_lib_pq_pg_encoding_to_char+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -73018,7 +73198,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5 $as_echo "$ac_cv_lib_pq_pg_encoding_to_char" >&6; } -if test "x$ac_cv_lib_pq_pg_encoding_to_char" = x""yes; then : +if test "x$ac_cv_lib_pq_pg_encoding_to_char" = xyes; then : $as_echo "#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1" >>confdefs.h @@ -73166,7 +73346,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 $as_echo_n "checking for PDO includes... " >&6; } -if test "${pdo_cv_inc_path+set}" = set; then : +if ${pdo_cv_inc_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -73186,7 +73366,7 @@ $as_echo "$pdo_cv_inc_path" >&6; } if test -n "$pdo_cv_inc_path"; then : else -as_fn_error "Cannot find php_pdo_driver.h." "$LINENO" 5 +as_fn_error $? "Cannot find php_pdo_driver.h." "$LINENO" 5 fi @@ -73490,7 +73670,7 @@ EOF is_it_shared=$PHP_PDO_SHARED is_it_enabled=$PHP_PDO if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_pgsql to build statically, but it depends on extension pdo, which you've configured to build shared. You either need to build pdo_pgsql shared or build pdo statically for the @@ -73498,7 +73678,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_pgsql, which depends on extension pdo, but you've either not enabled pdo, or have disabled it. " "$LINENO" 5 @@ -73556,14 +73736,14 @@ $as_echo "$ext_output" >&6; } if test "$PHP_PDO_SQLITE" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then - as_fn_error "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 + as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 $as_echo_n "checking for PDO includes... " >&6; } -if test "${pdo_cv_inc_path+set}" = set; then : +if ${pdo_cv_inc_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -73583,7 +73763,7 @@ $as_echo "$pdo_cv_inc_path" >&6; } if test -n "$pdo_cv_inc_path"; then : else -as_fn_error "Cannot find php_pdo_driver.h." "$LINENO" 5 +as_fn_error $? "Cannot find php_pdo_driver.h." "$LINENO" 5 fi @@ -73609,7 +73789,7 @@ $as_echo "found in $i" >&6; } if test -z "$PDO_SQLITE_DIR"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - as_fn_error "Please reinstall the sqlite3 distribution" "$LINENO" 5 + as_fn_error $? "Please reinstall the sqlite3 distribution" "$LINENO" 5 fi @@ -73747,7 +73927,7 @@ $as_echo "not found" >&6; } as_ac_Lib=`$as_echo "ac_cv_lib_$LIBNAME''_$LIBSYMBOL" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBSYMBOL in -l$LIBNAME" >&5 $as_echo_n "checking for $LIBSYMBOL in -l$LIBNAME... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -73782,8 +73962,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -73896,7 +74075,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_$LIBNAME_$LIBSYMBOL - as_fn_error "wrong sqlite lib version or lib not found" "$LINENO" 5 + as_fn_error $? "wrong sqlite lib version or lib not found" "$LINENO" 5 fi @@ -73998,7 +74177,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_key in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_key in -lsqlite3... " >&6; } -if test "${ac_cv_lib_sqlite3_sqlite3_key+set}" = set; then : +if ${ac_cv_lib_sqlite3_sqlite3_key+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -74032,7 +74211,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_key" >&5 $as_echo "$ac_cv_lib_sqlite3_sqlite3_key" >&6; } -if test "x$ac_cv_lib_sqlite3_sqlite3_key" = x""yes; then : +if test "x$ac_cv_lib_sqlite3_sqlite3_key" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -74710,7 +74889,7 @@ EOF is_it_shared=$PHP_SQLITE3_SHARED is_it_enabled=$PHP_SQLITE3 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_sqlite to build statically, but it depends on extension sqlite3, which you've configured to build shared. You either need to build pdo_sqlite shared or build sqlite3 statically for the @@ -74718,7 +74897,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_sqlite, which depends on extension sqlite3, but you've either not enabled sqlite3, or have disabled it. " "$LINENO" 5 @@ -74760,8 +74939,7 @@ but you've either not enabled sqlite3, or have disabled it. 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 @@ -74772,7 +74950,7 @@ done for ac_header in time.h do : ac_fn_c_check_header_mongrel "$LINENO" "time.h" "ac_cv_header_time_h" "$ac_includes_default" -if test "x$ac_cv_header_time_h" = x""yes; then : +if test "x$ac_cv_header_time_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_TIME_H 1 _ACEOF @@ -74880,7 +75058,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdatasync in -lrt" >&5 $as_echo_n "checking for fdatasync in -lrt... " >&6; } -if test "${ac_cv_lib_rt_fdatasync+set}" = set; then : +if ${ac_cv_lib_rt_fdatasync+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -74914,7 +75092,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_fdatasync" >&5 $as_echo "$ac_cv_lib_rt_fdatasync" >&6; } -if test "x$ac_cv_lib_rt_fdatasync" = x""yes; then : +if test "x$ac_cv_lib_rt_fdatasync" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -74958,7 +75136,7 @@ fi is_it_shared=$PHP_PDO_SHARED is_it_enabled=$PHP_PDO if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_sqlite to build statically, but it depends on extension pdo, which you've configured to build shared. You either need to build pdo_sqlite shared or build pdo statically for the @@ -74966,7 +75144,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension pdo_sqlite, which depends on extension pdo, but you've either not enabled pdo, or have disabled it. " "$LINENO" 5 @@ -75084,15 +75262,15 @@ $as_echo "#define HAVE_PG_CONFIG_H 1" >>confdefs.h fi if test -z "$PGSQL_INCLUDE"; then - as_fn_error "Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" "$LINENO" 5 + as_fn_error $? "Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" "$LINENO" 5 fi if test -z "$PGSQL_LIBDIR"; then - as_fn_error "Cannot find libpq.so. Please specify correct PostgreSQL installation path" "$LINENO" 5 + as_fn_error $? "Cannot find libpq.so. Please specify correct PostgreSQL installation path" "$LINENO" 5 fi if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then - as_fn_error "Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" "$LINENO" 5 + as_fn_error $? "Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" "$LINENO" 5 fi @@ -75103,7 +75281,7 @@ $as_echo "#define HAVE_PGSQL 1" >>confdefs.h LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeString in -lpq" >&5 $as_echo_n "checking for PQescapeString in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQescapeString+set}" = set; then : +if ${ac_cv_lib_pq_PQescapeString+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75137,7 +75315,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeString" >&5 $as_echo "$ac_cv_lib_pq_PQescapeString" >&6; } -if test "x$ac_cv_lib_pq_PQescapeString" = x""yes; then : +if test "x$ac_cv_lib_pq_PQescapeString" = xyes; then : $as_echo "#define HAVE_PQESCAPE 1" >>confdefs.h @@ -75145,7 +75323,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQunescapeBytea in -lpq" >&5 $as_echo_n "checking for PQunescapeBytea in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQunescapeBytea+set}" = set; then : +if ${ac_cv_lib_pq_PQunescapeBytea+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75179,7 +75357,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQunescapeBytea" >&5 $as_echo "$ac_cv_lib_pq_PQunescapeBytea" >&6; } -if test "x$ac_cv_lib_pq_PQunescapeBytea" = x""yes; then : +if test "x$ac_cv_lib_pq_PQunescapeBytea" = xyes; then : $as_echo "#define HAVE_PQUNESCAPEBYTEA 1" >>confdefs.h @@ -75187,7 +75365,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsetnonblocking in -lpq" >&5 $as_echo_n "checking for PQsetnonblocking in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQsetnonblocking+set}" = set; then : +if ${ac_cv_lib_pq_PQsetnonblocking+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75221,7 +75399,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsetnonblocking" >&5 $as_echo "$ac_cv_lib_pq_PQsetnonblocking" >&6; } -if test "x$ac_cv_lib_pq_PQsetnonblocking" = x""yes; then : +if test "x$ac_cv_lib_pq_PQsetnonblocking" = xyes; then : $as_echo "#define HAVE_PQSETNONBLOCKING 1" >>confdefs.h @@ -75229,7 +75407,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQcmdTuples in -lpq" >&5 $as_echo_n "checking for PQcmdTuples in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQcmdTuples+set}" = set; then : +if ${ac_cv_lib_pq_PQcmdTuples+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75263,7 +75441,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQcmdTuples" >&5 $as_echo "$ac_cv_lib_pq_PQcmdTuples" >&6; } -if test "x$ac_cv_lib_pq_PQcmdTuples" = x""yes; then : +if test "x$ac_cv_lib_pq_PQcmdTuples" = xyes; then : $as_echo "#define HAVE_PQCMDTUPLES 1" >>confdefs.h @@ -75271,7 +75449,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQoidValue in -lpq" >&5 $as_echo_n "checking for PQoidValue in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQoidValue+set}" = set; then : +if ${ac_cv_lib_pq_PQoidValue+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75305,7 +75483,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQoidValue" >&5 $as_echo "$ac_cv_lib_pq_PQoidValue" >&6; } -if test "x$ac_cv_lib_pq_PQoidValue" = x""yes; then : +if test "x$ac_cv_lib_pq_PQoidValue" = xyes; then : $as_echo "#define HAVE_PQOIDVALUE 1" >>confdefs.h @@ -75313,7 +75491,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQclientEncoding in -lpq" >&5 $as_echo_n "checking for PQclientEncoding in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQclientEncoding+set}" = set; then : +if ${ac_cv_lib_pq_PQclientEncoding+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75347,7 +75525,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQclientEncoding" >&5 $as_echo "$ac_cv_lib_pq_PQclientEncoding" >&6; } -if test "x$ac_cv_lib_pq_PQclientEncoding" = x""yes; then : +if test "x$ac_cv_lib_pq_PQclientEncoding" = xyes; then : $as_echo "#define HAVE_PQCLIENTENCODING 1" >>confdefs.h @@ -75355,7 +75533,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQparameterStatus in -lpq" >&5 $as_echo_n "checking for PQparameterStatus in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQparameterStatus+set}" = set; then : +if ${ac_cv_lib_pq_PQparameterStatus+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75389,7 +75567,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQparameterStatus" >&5 $as_echo "$ac_cv_lib_pq_PQparameterStatus" >&6; } -if test "x$ac_cv_lib_pq_PQparameterStatus" = x""yes; then : +if test "x$ac_cv_lib_pq_PQparameterStatus" = xyes; then : $as_echo "#define HAVE_PQPARAMETERSTATUS 1" >>confdefs.h @@ -75397,7 +75575,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQprotocolVersion in -lpq" >&5 $as_echo_n "checking for PQprotocolVersion in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQprotocolVersion+set}" = set; then : +if ${ac_cv_lib_pq_PQprotocolVersion+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75431,7 +75609,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQprotocolVersion" >&5 $as_echo "$ac_cv_lib_pq_PQprotocolVersion" >&6; } -if test "x$ac_cv_lib_pq_PQprotocolVersion" = x""yes; then : +if test "x$ac_cv_lib_pq_PQprotocolVersion" = xyes; then : $as_echo "#define HAVE_PQPROTOCOLVERSION 1" >>confdefs.h @@ -75439,7 +75617,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQtransactionStatus in -lpq" >&5 $as_echo_n "checking for PQtransactionStatus in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQtransactionStatus+set}" = set; then : +if ${ac_cv_lib_pq_PQtransactionStatus+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75473,7 +75651,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQtransactionStatus" >&5 $as_echo "$ac_cv_lib_pq_PQtransactionStatus" >&6; } -if test "x$ac_cv_lib_pq_PQtransactionStatus" = x""yes; then : +if test "x$ac_cv_lib_pq_PQtransactionStatus" = xyes; then : $as_echo "#define HAVE_PGTRANSACTIONSTATUS 1" >>confdefs.h @@ -75481,7 +75659,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQexecParams in -lpq" >&5 $as_echo_n "checking for PQexecParams in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQexecParams+set}" = set; then : +if ${ac_cv_lib_pq_PQexecParams+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75515,7 +75693,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQexecParams" >&5 $as_echo "$ac_cv_lib_pq_PQexecParams" >&6; } -if test "x$ac_cv_lib_pq_PQexecParams" = x""yes; then : +if test "x$ac_cv_lib_pq_PQexecParams" = xyes; then : $as_echo "#define HAVE_PQEXECPARAMS 1" >>confdefs.h @@ -75523,7 +75701,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQprepare in -lpq" >&5 $as_echo_n "checking for PQprepare in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQprepare+set}" = set; then : +if ${ac_cv_lib_pq_PQprepare+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75557,7 +75735,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQprepare" >&5 $as_echo "$ac_cv_lib_pq_PQprepare" >&6; } -if test "x$ac_cv_lib_pq_PQprepare" = x""yes; then : +if test "x$ac_cv_lib_pq_PQprepare" = xyes; then : $as_echo "#define HAVE_PQPREPARE 1" >>confdefs.h @@ -75565,7 +75743,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQexecPrepared in -lpq" >&5 $as_echo_n "checking for PQexecPrepared in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQexecPrepared+set}" = set; then : +if ${ac_cv_lib_pq_PQexecPrepared+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75599,7 +75777,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQexecPrepared" >&5 $as_echo "$ac_cv_lib_pq_PQexecPrepared" >&6; } -if test "x$ac_cv_lib_pq_PQexecPrepared" = x""yes; then : +if test "x$ac_cv_lib_pq_PQexecPrepared" = xyes; then : $as_echo "#define HAVE_PQEXECPREPARED 1" >>confdefs.h @@ -75607,7 +75785,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQresultErrorField in -lpq" >&5 $as_echo_n "checking for PQresultErrorField in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQresultErrorField+set}" = set; then : +if ${ac_cv_lib_pq_PQresultErrorField+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75641,7 +75819,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQresultErrorField" >&5 $as_echo "$ac_cv_lib_pq_PQresultErrorField" >&6; } -if test "x$ac_cv_lib_pq_PQresultErrorField" = x""yes; then : +if test "x$ac_cv_lib_pq_PQresultErrorField" = xyes; then : $as_echo "#define HAVE_PQRESULTERRORFIELD 1" >>confdefs.h @@ -75649,7 +75827,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsendQueryParams in -lpq" >&5 $as_echo_n "checking for PQsendQueryParams in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQsendQueryParams+set}" = set; then : +if ${ac_cv_lib_pq_PQsendQueryParams+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75683,7 +75861,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsendQueryParams" >&5 $as_echo "$ac_cv_lib_pq_PQsendQueryParams" >&6; } -if test "x$ac_cv_lib_pq_PQsendQueryParams" = x""yes; then : +if test "x$ac_cv_lib_pq_PQsendQueryParams" = xyes; then : $as_echo "#define HAVE_PQSENDQUERYPARAMS 1" >>confdefs.h @@ -75691,7 +75869,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsendPrepare in -lpq" >&5 $as_echo_n "checking for PQsendPrepare in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQsendPrepare+set}" = set; then : +if ${ac_cv_lib_pq_PQsendPrepare+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75725,7 +75903,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsendPrepare" >&5 $as_echo "$ac_cv_lib_pq_PQsendPrepare" >&6; } -if test "x$ac_cv_lib_pq_PQsendPrepare" = x""yes; then : +if test "x$ac_cv_lib_pq_PQsendPrepare" = xyes; then : $as_echo "#define HAVE_PQSENDPREPARE 1" >>confdefs.h @@ -75733,7 +75911,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsendQueryPrepared in -lpq" >&5 $as_echo_n "checking for PQsendQueryPrepared in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQsendQueryPrepared+set}" = set; then : +if ${ac_cv_lib_pq_PQsendQueryPrepared+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75767,7 +75945,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5 $as_echo "$ac_cv_lib_pq_PQsendQueryPrepared" >&6; } -if test "x$ac_cv_lib_pq_PQsendQueryPrepared" = x""yes; then : +if test "x$ac_cv_lib_pq_PQsendQueryPrepared" = xyes; then : $as_echo "#define HAVE_PQSENDQUERYPREPARED 1" >>confdefs.h @@ -75775,7 +75953,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQputCopyData in -lpq" >&5 $as_echo_n "checking for PQputCopyData in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQputCopyData+set}" = set; then : +if ${ac_cv_lib_pq_PQputCopyData+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75809,7 +75987,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQputCopyData" >&5 $as_echo "$ac_cv_lib_pq_PQputCopyData" >&6; } -if test "x$ac_cv_lib_pq_PQputCopyData" = x""yes; then : +if test "x$ac_cv_lib_pq_PQputCopyData" = xyes; then : $as_echo "#define HAVE_PQPUTCOPYDATA 1" >>confdefs.h @@ -75817,7 +75995,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQputCopyEnd in -lpq" >&5 $as_echo_n "checking for PQputCopyEnd in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQputCopyEnd+set}" = set; then : +if ${ac_cv_lib_pq_PQputCopyEnd+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75851,7 +76029,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQputCopyEnd" >&5 $as_echo "$ac_cv_lib_pq_PQputCopyEnd" >&6; } -if test "x$ac_cv_lib_pq_PQputCopyEnd" = x""yes; then : +if test "x$ac_cv_lib_pq_PQputCopyEnd" = xyes; then : $as_echo "#define HAVE_PQPUTCOPYEND 1" >>confdefs.h @@ -75859,7 +76037,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQgetCopyData in -lpq" >&5 $as_echo_n "checking for PQgetCopyData in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQgetCopyData+set}" = set; then : +if ${ac_cv_lib_pq_PQgetCopyData+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75893,7 +76071,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQgetCopyData" >&5 $as_echo "$ac_cv_lib_pq_PQgetCopyData" >&6; } -if test "x$ac_cv_lib_pq_PQgetCopyData" = x""yes; then : +if test "x$ac_cv_lib_pq_PQgetCopyData" = xyes; then : $as_echo "#define HAVE_PQGETCOPYDATA 1" >>confdefs.h @@ -75901,7 +76079,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQfreemem in -lpq" >&5 $as_echo_n "checking for PQfreemem in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQfreemem+set}" = set; then : +if ${ac_cv_lib_pq_PQfreemem+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75935,7 +76113,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQfreemem" >&5 $as_echo "$ac_cv_lib_pq_PQfreemem" >&6; } -if test "x$ac_cv_lib_pq_PQfreemem" = x""yes; then : +if test "x$ac_cv_lib_pq_PQfreemem" = xyes; then : $as_echo "#define HAVE_PQFREEMEM 1" >>confdefs.h @@ -75943,7 +76121,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsetErrorVerbosity in -lpq" >&5 $as_echo_n "checking for PQsetErrorVerbosity in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQsetErrorVerbosity+set}" = set; then : +if ${ac_cv_lib_pq_PQsetErrorVerbosity+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -75977,7 +76155,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsetErrorVerbosity" >&5 $as_echo "$ac_cv_lib_pq_PQsetErrorVerbosity" >&6; } -if test "x$ac_cv_lib_pq_PQsetErrorVerbosity" = x""yes; then : +if test "x$ac_cv_lib_pq_PQsetErrorVerbosity" = xyes; then : $as_echo "#define HAVE_PQSETERRORVERBOSITY 1" >>confdefs.h @@ -75985,7 +76163,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQftable in -lpq" >&5 $as_echo_n "checking for PQftable in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQftable+set}" = set; then : +if ${ac_cv_lib_pq_PQftable+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -76019,7 +76197,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQftable" >&5 $as_echo "$ac_cv_lib_pq_PQftable" >&6; } -if test "x$ac_cv_lib_pq_PQftable" = x""yes; then : +if test "x$ac_cv_lib_pq_PQftable" = xyes; then : $as_echo "#define HAVE_PQFTABLE 1" >>confdefs.h @@ -76027,7 +76205,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeStringConn in -lpq" >&5 $as_echo_n "checking for PQescapeStringConn in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQescapeStringConn+set}" = set; then : +if ${ac_cv_lib_pq_PQescapeStringConn+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -76061,7 +76239,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeStringConn" >&5 $as_echo "$ac_cv_lib_pq_PQescapeStringConn" >&6; } -if test "x$ac_cv_lib_pq_PQescapeStringConn" = x""yes; then : +if test "x$ac_cv_lib_pq_PQescapeStringConn" = xyes; then : $as_echo "#define HAVE_PQESCAPE_CONN 1" >>confdefs.h @@ -76069,7 +76247,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeByteaConn in -lpq" >&5 $as_echo_n "checking for PQescapeByteaConn in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQescapeByteaConn+set}" = set; then : +if ${ac_cv_lib_pq_PQescapeByteaConn+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -76103,7 +76281,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeByteaConn" >&5 $as_echo "$ac_cv_lib_pq_PQescapeByteaConn" >&6; } -if test "x$ac_cv_lib_pq_PQescapeByteaConn" = x""yes; then : +if test "x$ac_cv_lib_pq_PQescapeByteaConn" = xyes; then : $as_echo "#define HAVE_PQESCAPE_BYTEA_CONN 1" >>confdefs.h @@ -76111,7 +76289,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_encoding_to_char in -lpq" >&5 $as_echo_n "checking for pg_encoding_to_char in -lpq... " >&6; } -if test "${ac_cv_lib_pq_pg_encoding_to_char+set}" = set; then : +if ${ac_cv_lib_pq_pg_encoding_to_char+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -76145,7 +76323,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5 $as_echo "$ac_cv_lib_pq_pg_encoding_to_char" >&6; } -if test "x$ac_cv_lib_pq_pg_encoding_to_char" = x""yes; then : +if test "x$ac_cv_lib_pq_pg_encoding_to_char" = xyes; then : $as_echo "#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1" >>confdefs.h @@ -76153,7 +76331,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lo_create in -lpq" >&5 $as_echo_n "checking for lo_create in -lpq... " >&6; } -if test "${ac_cv_lib_pq_lo_create+set}" = set; then : +if ${ac_cv_lib_pq_lo_create+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -76187,7 +76365,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_lo_create" >&5 $as_echo "$ac_cv_lib_pq_lo_create" >&6; } -if test "x$ac_cv_lib_pq_lo_create" = x""yes; then : +if test "x$ac_cv_lib_pq_lo_create" = xyes; then : $as_echo "#define HAVE_PG_LO_CREATE 1" >>confdefs.h @@ -76195,7 +76373,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lo_import_with_oid in -lpq" >&5 $as_echo_n "checking for lo_import_with_oid in -lpq... " >&6; } -if test "${ac_cv_lib_pq_lo_import_with_oid+set}" = set; then : +if ${ac_cv_lib_pq_lo_import_with_oid+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -76229,7 +76407,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_lo_import_with_oid" >&5 $as_echo "$ac_cv_lib_pq_lo_import_with_oid" >&6; } -if test "x$ac_cv_lib_pq_lo_import_with_oid" = x""yes; then : +if test "x$ac_cv_lib_pq_lo_import_with_oid" = xyes; then : $as_echo "#define HAVE_PG_LO_IMPORT_WITH_OID 1" >>confdefs.h @@ -76237,7 +76415,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeLiteral in -lpq" >&5 $as_echo_n "checking for PQescapeLiteral in -lpq... " >&6; } -if test "${ac_cv_lib_pq_PQescapeLiteral+set}" = set; then : +if ${ac_cv_lib_pq_PQescapeLiteral+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -76271,7 +76449,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeLiteral" >&5 $as_echo "$ac_cv_lib_pq_PQescapeLiteral" >&6; } -if test "x$ac_cv_lib_pq_PQescapeLiteral" = x""yes; then : +if test "x$ac_cv_lib_pq_PQescapeLiteral" = xyes; then : $as_echo "#define HAVE_PQESCAPELITERAL 1" >>confdefs.h @@ -77081,7 +77259,7 @@ $as_echo "no" >&6; } is_it_shared=$PHP_HASH_SHARED is_it_enabled=$PHP_HASH if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension phar to build statically, but it depends on extension hash, which you've configured to build shared. You either need to build phar shared or build hash statically for the @@ -77089,7 +77267,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension phar, which depends on extension hash, but you've either not enabled hash, or have disabled it. " "$LINENO" 5 @@ -77100,7 +77278,7 @@ but you've either not enabled hash, or have disabled it. is_it_shared=$PHP_SPL_SHARED is_it_enabled=$PHP_SPL if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension phar to build statically, but it depends on extension spl, which you've configured to build shared. You either need to build phar shared or build spl statically for the @@ -77108,7 +77286,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension phar, which depends on extension spl, but you've either not enabled spl, or have disabled it. " "$LINENO" 5 @@ -77472,7 +77650,7 @@ EOF for ac_header in sys/mkdev.h do : ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_mkdev_h" = x""yes; then : +if test "x$ac_cv_header_sys_mkdev_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SYS_MKDEV_H 1 _ACEOF @@ -77486,8 +77664,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 @@ -77538,7 +77715,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utsname.domainname" >&5 $as_echo_n "checking for utsname.domainname... " >&6; } -if test "${ac_cv_have_utsname_domainname+set}" = set; then : +if ${ac_cv_have_utsname_domainname+:} false; then : $as_echo_n "(cached) " >&6 else @@ -77935,7 +78112,7 @@ EOF done if test -z "$PSPELL_DIR"; then - as_fn_error "Cannot find pspell" "$LINENO" 5 + as_fn_error $? "Cannot find pspell" "$LINENO" 5 fi PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR @@ -78137,7 +78314,7 @@ EOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for new_aspell_config in -laspell" >&5 $as_echo_n "checking for new_aspell_config in -laspell... " >&6; } -if test "${ac_cv_lib_aspell_new_aspell_config+set}" = set; then : +if ${ac_cv_lib_aspell_new_aspell_config+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -78171,7 +78348,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aspell_new_aspell_config" >&5 $as_echo "$ac_cv_lib_aspell_new_aspell_config" >&6; } -if test "x$ac_cv_lib_aspell_new_aspell_config" = x""yes; then : +if test "x$ac_cv_lib_aspell_new_aspell_config" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -78425,7 +78602,7 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then done if test -z "$READLINE_DIR"; then - as_fn_error "Please reinstall readline - I cannot find readline.h" "$LINENO" 5 + as_fn_error $? "Please reinstall readline - I cannot find readline.h" "$LINENO" 5 fi @@ -78463,7 +78640,7 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then PHP_READLINE_LIBS="" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5 $as_echo_n "checking for tgetent in -lncurses... " >&6; } -if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then : +if ${ac_cv_lib_ncurses_tgetent+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -78497,7 +78674,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5 $as_echo "$ac_cv_lib_ncurses_tgetent" >&6; } -if test "x$ac_cv_lib_ncurses_tgetent" = x""yes; then : +if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then : @@ -78528,7 +78705,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 $as_echo_n "checking for tgetent in -ltermcap... " >&6; } -if test "${ac_cv_lib_termcap_tgetent+set}" = set; then : +if ${ac_cv_lib_termcap_tgetent+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -78562,7 +78739,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5 $as_echo "$ac_cv_lib_termcap_tgetent" >&6; } -if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then : +if test "x$ac_cv_lib_termcap_tgetent" = xyes; then : @@ -78694,7 +78871,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 $as_echo_n "checking for readline in -lreadline... " >&6; } -if test "${ac_cv_lib_readline_readline+set}" = set; then : +if ${ac_cv_lib_readline_readline+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -78728,7 +78905,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5 $as_echo "$ac_cv_lib_readline_readline" >&6; } -if test "x$ac_cv_lib_readline_readline" = x""yes; then : +if test "x$ac_cv_lib_readline_readline" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -78838,7 +79015,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_readline_readline - as_fn_error "readline library not found" "$LINENO" 5 + as_fn_error $? "readline library not found" "$LINENO" 5 fi @@ -78943,7 +79120,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pending_input in -lreadline" >&5 $as_echo_n "checking for rl_pending_input in -lreadline... " >&6; } -if test "${ac_cv_lib_readline_rl_pending_input+set}" = set; then : +if ${ac_cv_lib_readline_rl_pending_input+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -78977,7 +79154,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_pending_input" >&5 $as_echo "$ac_cv_lib_readline_rl_pending_input" >&6; } -if test "x$ac_cv_lib_readline_rl_pending_input" = x""yes; then : +if test "x$ac_cv_lib_readline_rl_pending_input" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -78989,7 +79166,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_readline_rl_pending_input - as_fn_error "invalid readline installation detected. Try --with-libedit instead." "$LINENO" 5 + as_fn_error $? "invalid readline installation detected. Try --with-libedit instead." "$LINENO" 5 fi @@ -79094,7 +79271,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -lreadline" >&5 $as_echo_n "checking for rl_callback_read_char in -lreadline... " >&6; } -if test "${ac_cv_lib_readline_rl_callback_read_char+set}" = set; then : +if ${ac_cv_lib_readline_rl_callback_read_char+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -79128,7 +79305,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_read_char" >&5 $as_echo "$ac_cv_lib_readline_rl_callback_read_char" >&6; } -if test "x$ac_cv_lib_readline_rl_callback_read_char" = x""yes; then : +if test "x$ac_cv_lib_readline_rl_callback_read_char" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -79247,7 +79424,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -ledit" >&5 $as_echo_n "checking for rl_on_new_line in -ledit... " >&6; } -if test "${ac_cv_lib_edit_rl_on_new_line+set}" = set; then : +if ${ac_cv_lib_edit_rl_on_new_line+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -79281,7 +79458,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_on_new_line" >&5 $as_echo "$ac_cv_lib_edit_rl_on_new_line" >&6; } -if test "x$ac_cv_lib_edit_rl_on_new_line" = x""yes; then : +if test "x$ac_cv_lib_edit_rl_on_new_line" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -79312,7 +79489,7 @@ elif test "$PHP_LIBEDIT" != "no"; then done if test -z "$LIBEDIT_DIR"; then - as_fn_error "Please reinstall libedit - I cannot find readline.h" "$LINENO" 5 + as_fn_error $? "Please reinstall libedit - I cannot find readline.h" "$LINENO" 5 fi @@ -79349,7 +79526,7 @@ elif test "$PHP_LIBEDIT" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5 $as_echo_n "checking for tgetent in -lncurses... " >&6; } -if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then : +if ${ac_cv_lib_ncurses_tgetent+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -79383,7 +79560,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5 $as_echo "$ac_cv_lib_ncurses_tgetent" >&6; } -if test "x$ac_cv_lib_ncurses_tgetent" = x""yes; then : +if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then : @@ -79413,7 +79590,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 $as_echo_n "checking for tgetent in -ltermcap... " >&6; } -if test "${ac_cv_lib_termcap_tgetent+set}" = set; then : +if ${ac_cv_lib_termcap_tgetent+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -79447,7 +79624,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5 $as_echo "$ac_cv_lib_termcap_tgetent" >&6; } -if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then : +if test "x$ac_cv_lib_termcap_tgetent" = xyes; then : @@ -79578,7 +79755,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5 $as_echo_n "checking for readline in -ledit... " >&6; } -if test "${ac_cv_lib_edit_readline+set}" = set; then : +if ${ac_cv_lib_edit_readline+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -79612,7 +79789,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5 $as_echo "$ac_cv_lib_edit_readline" >&6; } -if test "x$ac_cv_lib_edit_readline" = x""yes; then : +if test "x$ac_cv_lib_edit_readline" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -79722,7 +79899,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_edit_readline - as_fn_error "edit library required by readline not found" "$LINENO" 5 + as_fn_error $? "edit library required by readline not found" "$LINENO" 5 fi @@ -79827,7 +80004,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -ledit" >&5 $as_echo_n "checking for rl_callback_read_char in -ledit... " >&6; } -if test "${ac_cv_lib_edit_rl_callback_read_char+set}" = set; then : +if ${ac_cv_lib_edit_rl_callback_read_char+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -79861,7 +80038,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_callback_read_char" >&5 $as_echo "$ac_cv_lib_edit_rl_callback_read_char" >&6; } -if test "x$ac_cv_lib_edit_rl_callback_read_char" = x""yes; then : +if test "x$ac_cv_lib_edit_rl_callback_read_char" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -79980,7 +80157,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -ledit" >&5 $as_echo_n "checking for rl_on_new_line in -ledit... " >&6; } -if test "${ac_cv_lib_edit_rl_on_new_line+set}" = set; then : +if ${ac_cv_lib_edit_rl_on_new_line+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -80014,7 +80191,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_on_new_line" >&5 $as_echo "$ac_cv_lib_edit_rl_on_new_line" >&6; } -if test "x$ac_cv_lib_edit_rl_on_new_line" = x""yes; then : +if test "x$ac_cv_lib_edit_rl_on_new_line" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -80043,7 +80220,7 @@ if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then for ac_func in rl_completion_matches do : ac_fn_c_check_func "$LINENO" "rl_completion_matches" "ac_cv_func_rl_completion_matches" -if test "x$ac_cv_func_rl_completion_matches" = x""yes; then : +if test "x$ac_cv_func_rl_completion_matches" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_RL_COMPLETION_MATCHES 1 _ACEOF @@ -80418,7 +80595,7 @@ if test "$PHP_RECODE" != "no"; then done if test -z "$RECODE_DIR"; then - as_fn_error "Can not find recode.h anywhere under $RECODE_LIST." "$LINENO" 5 + as_fn_error $? "Can not find recode.h anywhere under $RECODE_LIST." "$LINENO" 5 fi @@ -80520,7 +80697,7 @@ if test "$PHP_RECODE" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recode_format_table in -lrecode" >&5 $as_echo_n "checking for recode_format_table in -lrecode... " >&6; } -if test "${ac_cv_lib_recode_recode_format_table+set}" = set; then : +if ${ac_cv_lib_recode_recode_format_table+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -80554,7 +80731,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_recode_recode_format_table" >&5 $as_echo "$ac_cv_lib_recode_recode_format_table" >&6; } -if test "x$ac_cv_lib_recode_recode_format_table" = x""yes; then : +if test "x$ac_cv_lib_recode_recode_format_table" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -80788,7 +80965,7 @@ $as_echo "#define HAVE_BROKEN_RECODE 1" >>confdefs.h else - as_fn_error "I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" "$LINENO" 5 + as_fn_error $? "I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext \ @@ -80840,7 +81017,7 @@ $as_echo "#define HAVE_LIBRECODE 1" >>confdefs.h for ac_header in stdbool.h do : ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default" -if test "x$ac_cv_header_stdbool_h" = x""yes; then : +if test "x$ac_cv_header_stdbool_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STDBOOL_H 1 _ACEOF @@ -81515,7 +81692,7 @@ if test "$PHP_SESSION" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pwrite works" >&5 $as_echo_n "checking whether pwrite works... " >&6; } -if test "${ac_cv_pwrite+set}" = set; then : +if ${ac_cv_pwrite+:} false; then : $as_echo_n "(cached) " >&6 else @@ -81625,7 +81802,7 @@ $as_echo "#define PHP_PWRITE_64 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pread works" >&5 $as_echo_n "checking whether pread works... " >&6; } -if test "${ac_cv_pread+set}" = set; then : +if ${ac_cv_pread+:} false; then : $as_echo_n "(cached) " >&6 else @@ -82032,7 +82209,7 @@ EOF is_it_shared=$PHP_HASH_SHARED is_it_enabled=$PHP_HASH if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension session to build statically, but it depends on extension hash, which you've configured to build shared. You either need to build session shared or build hash statically for the @@ -82040,7 +82217,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension session, which depends on extension hash, but you've either not enabled hash, or have disabled it. " "$LINENO" 5 @@ -82051,7 +82228,7 @@ but you've either not enabled hash, or have disabled it. is_it_shared=$PHP_SPL_SHARED is_it_enabled=$PHP_SPL if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension session to build statically, but it depends on extension spl, which you've configured to build shared. You either need to build session shared or build spl statically for the @@ -82059,7 +82236,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension session, which depends on extension spl, but you've either not enabled spl, or have disabled it. " "$LINENO" 5 @@ -82099,7 +82276,7 @@ if test "$PHP_MM" != "no"; then done if test -z "$MM_DIR" ; then - as_fn_error "cannot find mm library" "$LINENO" 5 + as_fn_error $? "cannot find mm library" "$LINENO" 5 fi @@ -82670,13 +82847,13 @@ fi if test "$PHP_SIMPLEXML" != "no"; then if test "$PHP_LIBXML" = "no"; then - as_fn_error "SimpleXML extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 + as_fn_error $? "SimpleXML extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 $as_echo_n "checking for xml2-config path... " >&6; } -if test "${ac_cv_php_xml2_config_path+set}" = set; then : +if ${ac_cv_php_xml2_config_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -82834,7 +83011,7 @@ $as_echo "$ac_cv_php_xml2_config_path" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 $as_echo_n "checking whether libxml build works... " >&6; } -if test "${php_cv_libxml_build_works+set}" = set; then : +if ${php_cv_libxml_build_works+:} false; then : $as_echo_n "(cached) " >&6 else @@ -82872,7 +83049,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "build test failed. Please check the config.log for details." "$LINENO" 5 + as_fn_error $? "build test failed. Please check the config.log for details." "$LINENO" 5 fi @@ -83192,10 +83369,10 @@ EOF else - as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5 + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi else - as_fn_error "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 + as_fn_error $? "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 fi @@ -83204,7 +83381,7 @@ else is_it_shared=$PHP_LIBXML_SHARED is_it_enabled=$PHP_LIBXML if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension simplexml to build statically, but it depends on extension libxml, which you've configured to build shared. You either need to build simplexml shared or build libxml statically for the @@ -83212,7 +83389,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension simplexml, which depends on extension libxml, but you've either not enabled libxml, or have disabled it. " "$LINENO" 5 @@ -83223,7 +83400,7 @@ but you've either not enabled libxml, or have disabled it. is_it_shared=$PHP_SPL_SHARED is_it_enabled=$PHP_SPL if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension simplexml to build statically, but it depends on extension spl, which you've configured to build shared. You either need to build simplexml shared or build spl statically for the @@ -83231,7 +83408,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension simplexml, which depends on extension spl, but you've either not enabled spl, or have disabled it. " "$LINENO" 5 @@ -83316,7 +83493,7 @@ if test "$PHP_SNMP" != "no"; then set dummy net-snmp-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_path_SNMP_CONFIG+set}" = set; then : +if ${ac_cv_path_SNMP_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $SNMP_CONFIG in @@ -83331,7 +83508,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -83491,13 +83668,13 @@ fi SNMP_LIBNAME=netsnmp else - as_fn_error "Could not find the required paths. Please check your net-snmp installation." "$LINENO" 5 + as_fn_error $? "Could not find the required paths. Please check your net-snmp installation." "$LINENO" 5 fi else - as_fn_error "Net-SNMP version 5.3 or greater reqired (detected $snmp_full_version)." "$LINENO" 5 + as_fn_error $? "Net-SNMP version 5.3 or greater reqired (detected $snmp_full_version)." "$LINENO" 5 fi else - as_fn_error "Could not find net-snmp-config binary. Please check your net-snmp installation." "$LINENO" 5 + as_fn_error $? "Could not find net-snmp-config binary. Please check your net-snmp installation." "$LINENO" 5 fi @@ -83600,7 +83777,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$SNMP_LIBNAME''_init_snmp" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for init_snmp in -l$SNMP_LIBNAME" >&5 $as_echo_n "checking for init_snmp in -l$SNMP_LIBNAME... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -83635,8 +83812,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -83652,7 +83828,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_$SNMP_LIBNAME_init_snmp - as_fn_error "SNMP sanity check failed. Please check config.log for more information." "$LINENO" 5 + as_fn_error $? "SNMP sanity check failed. Please check config.log for more information." "$LINENO" 5 fi @@ -83758,7 +83934,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$SNMP_LIBNAME''_shutdown_snmp_logging" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shutdown_snmp_logging in -l$SNMP_LIBNAME" >&5 $as_echo_n "checking for shutdown_snmp_logging in -l$SNMP_LIBNAME... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -83793,8 +83969,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -84186,13 +84361,13 @@ fi if test "$PHP_SOAP" != "no"; then if test "$PHP_LIBXML" = "no"; then - as_fn_error "SOAP extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 + as_fn_error $? "SOAP extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 $as_echo_n "checking for xml2-config path... " >&6; } -if test "${ac_cv_php_xml2_config_path+set}" = set; then : +if ${ac_cv_php_xml2_config_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -84350,7 +84525,7 @@ $as_echo "$ac_cv_php_xml2_config_path" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 $as_echo_n "checking whether libxml build works... " >&6; } -if test "${php_cv_libxml_build_works+set}" = set; then : +if ${php_cv_libxml_build_works+:} false; then : $as_echo_n "(cached) " >&6 else @@ -84388,7 +84563,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "build test failed. Please check the config.log for details." "$LINENO" 5 + as_fn_error $? "build test failed. Please check the config.log for details." "$LINENO" 5 fi @@ -84708,10 +84883,10 @@ EOF else - as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5 + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi else - as_fn_error "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 + as_fn_error $? "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 fi @@ -84765,7 +84940,7 @@ $as_echo "$ext_output" >&6; } if test "$PHP_SOCKETS" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct cmsghdr" >&5 $as_echo_n "checking for struct cmsghdr... " >&6; } -if test "${ac_cv_cmsghdr+set}" = set; then : +if ${ac_cv_cmsghdr+:} false; then : $as_echo_n "(cached) " >&6 else @@ -84803,8 +84978,7 @@ $as_echo "#define HAVE_CMSGHDR 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 @@ -84816,8 +84990,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 @@ -84855,7 +85028,7 @@ $as_echo "#define HAVE_SOCKETS 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for field ss_family in struct sockaddr_storage" >&5 $as_echo_n "checking for field ss_family in struct sockaddr_storage... " >&6; } -if test "${ac_cv_ss_family+set}" = set; then : +if ${ac_cv_ss_family+:} false; then : $as_echo_n "(cached) " >&6 else @@ -85571,7 +85744,7 @@ EOF is_it_shared=$PHP_PCRE_SHARED is_it_enabled=$PHP_PCRE if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension spl to build statically, but it depends on extension pcre, which you've configured to build shared. You either need to build spl shared or build pcre statically for the @@ -85579,7 +85752,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension spl, which depends on extension pcre, but you've either not enabled pcre, or have disabled it. " "$LINENO" 5 @@ -85589,7 +85762,7 @@ but you've either not enabled pcre, or have disabled it. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether flush should be called explicitly after a buffered io" >&5 $as_echo_n "checking whether flush should be called explicitly after a buffered io... " >&6; } -if test "${ac_cv_flush_io+set}" = set; then : +if ${ac_cv_flush_io+:} false; then : $as_echo_n "(cached) " >&6 else @@ -85661,7 +85834,7 @@ fi if test "$ac_cv_func_crypt" = "no"; then { $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 @@ -85695,7 +85868,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 : LIBS="-lcrypt $LIBS -lcrypt" @@ -85708,7 +85881,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for standard DES crypt" >&5 $as_echo_n "checking for standard DES crypt... " >&6; } -if test "${ac_cv_crypt_des+set}" = set; then : +if ${ac_cv_crypt_des+:} false; then : $as_echo_n "(cached) " >&6 else @@ -85755,7 +85928,7 @@ $as_echo "$ac_cv_crypt_des" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extended DES crypt" >&5 $as_echo_n "checking for extended DES crypt... " >&6; } -if test "${ac_cv_crypt_ext_des+set}" = set; then : +if ${ac_cv_crypt_ext_des+:} false; then : $as_echo_n "(cached) " >&6 else @@ -85802,7 +85975,7 @@ $as_echo "$ac_cv_crypt_ext_des" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 crypt" >&5 $as_echo_n "checking for MD5 crypt... " >&6; } -if test "${ac_cv_crypt_md5+set}" = set; then : +if ${ac_cv_crypt_md5+:} false; then : $as_echo_n "(cached) " >&6 else @@ -85858,7 +86031,7 @@ $as_echo "$ac_cv_crypt_md5" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Blowfish crypt" >&5 $as_echo_n "checking for Blowfish crypt... " >&6; } -if test "${ac_cv_crypt_blowfish+set}" = set; then : +if ${ac_cv_crypt_blowfish+:} false; then : $as_echo_n "(cached) " >&6 else @@ -85911,7 +86084,7 @@ $as_echo "$ac_cv_crypt_blowfish" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA512 crypt" >&5 $as_echo_n "checking for SHA512 crypt... " >&6; } -if test "${ac_cv_crypt_SHA512+set}" = set; then : +if ${ac_cv_crypt_SHA512+:} false; then : $as_echo_n "(cached) " >&6 else @@ -85933,12 +86106,12 @@ else main() { #if HAVE_CRYPT - char salt[30], answer[80]; + char salt[21], answer[21+86]; - salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0'; + strcpy(salt,"\$6\$rasmuslerdorf\$"); strcpy(answer, salt); - strcpy(&answer[29],"$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu."); - exit (strcmp((char *)crypt("foo",salt),answer)); + strcat(answer, "EeHCRjm0bljalWuALHSTs1NB9ipEiLEXLhYeXdOpx22gmlmVejnVXFhd84cEKbYxCo.XuUTrW.RLraeEnsvWs/"); + exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); #else exit(0); #endif @@ -85963,7 +86136,7 @@ $as_echo "$ac_cv_crypt_SHA512" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA256 crypt" >&5 $as_echo_n "checking for SHA256 crypt... " >&6; } -if test "${ac_cv_crypt_SHA256+set}" = set; then : +if ${ac_cv_crypt_SHA256+:} false; then : $as_echo_n "(cached) " >&6 else @@ -85985,12 +86158,13 @@ else main() { #if HAVE_CRYPT - char salt[30], answer[80]; - salt[0]='$'; salt[1]='5'; salt[2]='$'; salt[3]='$'; salt[4]='s'; salt[5]='a'; salt[6]='l'; salt[7]='t'; salt[8]='s'; salt[9]='t'; salt[10]='r'; salt[11]='i'; salt[12]='n'; salt[13]='g'; salt[14]='\0'; - strcat(salt,""); + char salt[21], answer[21+43]; + + strcpy(salt,"\$5\$rasmuslerdorf\$"); strcpy(answer, salt); - strcpy(&answer[29], "$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5"); - exit (strcmp((char *)crypt("foo",salt),answer)); + strcat(answer, "cFAm2puLCujQ9t.0CxiFIIvFi4JyQx5UncCt/xRIX23"); + exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); + #else exit(0); #endif @@ -86018,7 +86192,7 @@ if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports __alignof__" >&5 $as_echo_n "checking whether the compiler supports __alignof__... " >&6; } -if test "${ac_cv_alignof_exists+set}" = set; then : +if ${ac_cv_alignof_exists+:} false; then : $as_echo_n "(cached) " >&6 else @@ -86057,7 +86231,7 @@ $as_echo "#define HAVE_ALIGNOF 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports aligned attribute" >&5 $as_echo_n "checking whether the compiler supports aligned attribute... " >&6; } -if test "${ac_cv_attribute_aligned+set}" = set; then : +if ${ac_cv_attribute_aligned+:} false; then : $as_echo_n "(cached) " >&6 else @@ -86264,8 +86438,7 @@ for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpcl 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 @@ -86275,7 +86448,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working POSIX fnmatch" >&5 $as_echo_n "checking for working POSIX fnmatch... " >&6; } -if test "${ac_cv_func_fnmatch_works+set}" = set; then : +if ${ac_cv_func_fnmatch_works+:} false; then : $as_echo_n "(cached) " >&6 else # Some versions of Solaris, SCO, and the GNU C Library @@ -86330,8 +86503,7 @@ for ac_func in fork CreateProcess 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 @@ -86393,11 +86565,11 @@ fi unset found ac_fn_c_check_func "$LINENO" "res_nsearch" "ac_cv_func_res_nsearch" -if test "x$ac_cv_func_res_nsearch" = x""yes; then : +if test "x$ac_cv_func_res_nsearch" = xyes; then : found=yes else ac_fn_c_check_func "$LINENO" "__res_nsearch" "ac_cv_func___res_nsearch" -if test "x$ac_cv_func___res_nsearch" = x""yes; then : +if test "x$ac_cv_func___res_nsearch" = xyes; then : found=yes else found=no @@ -86421,7 +86593,7 @@ $as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lresolv" >&5 $as_echo_n "checking for res_nsearch in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv_res_nsearch+set}" = set; then : +if ${ac_cv_lib_resolv_res_nsearch+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -86455,13 +86627,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_nsearch" >&5 $as_echo "$ac_cv_lib_resolv_res_nsearch" >&6; } -if test "x$ac_cv_lib_resolv_res_nsearch" = x""yes; then : +if test "x$ac_cv_lib_resolv_res_nsearch" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lresolv" >&5 $as_echo_n "checking for __res_nsearch in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv___res_nsearch+set}" = set; then : +if ${ac_cv_lib_resolv___res_nsearch+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -86495,7 +86667,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_nsearch" >&5 $as_echo "$ac_cv_lib_resolv___res_nsearch" >&6; } -if test "x$ac_cv_lib_resolv___res_nsearch" = x""yes; then : +if test "x$ac_cv_lib_resolv___res_nsearch" = xyes; then : found=yes else found=no @@ -86553,7 +86725,7 @@ $as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lbind" >&5 $as_echo_n "checking for res_nsearch in -lbind... " >&6; } -if test "${ac_cv_lib_bind_res_nsearch+set}" = set; then : +if ${ac_cv_lib_bind_res_nsearch+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -86587,13 +86759,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_nsearch" >&5 $as_echo "$ac_cv_lib_bind_res_nsearch" >&6; } -if test "x$ac_cv_lib_bind_res_nsearch" = x""yes; then : +if test "x$ac_cv_lib_bind_res_nsearch" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lbind" >&5 $as_echo_n "checking for __res_nsearch in -lbind... " >&6; } -if test "${ac_cv_lib_bind___res_nsearch+set}" = set; then : +if ${ac_cv_lib_bind___res_nsearch+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -86627,7 +86799,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_nsearch" >&5 $as_echo "$ac_cv_lib_bind___res_nsearch" >&6; } -if test "x$ac_cv_lib_bind___res_nsearch" = x""yes; then : +if test "x$ac_cv_lib_bind___res_nsearch" = xyes; then : found=yes else found=no @@ -86685,7 +86857,7 @@ $as_echo "#define HAVE_LIBBIND 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lsocket" >&5 $as_echo_n "checking for res_nsearch in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_res_nsearch+set}" = set; then : +if ${ac_cv_lib_socket_res_nsearch+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -86719,13 +86891,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_nsearch" >&5 $as_echo "$ac_cv_lib_socket_res_nsearch" >&6; } -if test "x$ac_cv_lib_socket_res_nsearch" = x""yes; then : +if test "x$ac_cv_lib_socket_res_nsearch" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lsocket" >&5 $as_echo_n "checking for __res_nsearch in -lsocket... " >&6; } -if test "${ac_cv_lib_socket___res_nsearch+set}" = set; then : +if ${ac_cv_lib_socket___res_nsearch+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -86759,7 +86931,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_nsearch" >&5 $as_echo "$ac_cv_lib_socket___res_nsearch" >&6; } -if test "x$ac_cv_lib_socket___res_nsearch" = x""yes; then : +if test "x$ac_cv_lib_socket___res_nsearch" = xyes; then : found=yes else found=no @@ -86831,11 +87003,11 @@ $as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h unset found ac_fn_c_check_func "$LINENO" "dns_search" "ac_cv_func_dns_search" -if test "x$ac_cv_func_dns_search" = x""yes; then : +if test "x$ac_cv_func_dns_search" = xyes; then : found=yes else ac_fn_c_check_func "$LINENO" "__dns_search" "ac_cv_func___dns_search" -if test "x$ac_cv_func___dns_search" = x""yes; then : +if test "x$ac_cv_func___dns_search" = xyes; then : found=yes else found=no @@ -86859,7 +87031,7 @@ $as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lresolv" >&5 $as_echo_n "checking for dns_search in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv_dns_search+set}" = set; then : +if ${ac_cv_lib_resolv_dns_search+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -86893,13 +87065,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dns_search" >&5 $as_echo "$ac_cv_lib_resolv_dns_search" >&6; } -if test "x$ac_cv_lib_resolv_dns_search" = x""yes; then : +if test "x$ac_cv_lib_resolv_dns_search" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lresolv" >&5 $as_echo_n "checking for __dns_search in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv___dns_search+set}" = set; then : +if ${ac_cv_lib_resolv___dns_search+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -86933,7 +87105,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dns_search" >&5 $as_echo "$ac_cv_lib_resolv___dns_search" >&6; } -if test "x$ac_cv_lib_resolv___dns_search" = x""yes; then : +if test "x$ac_cv_lib_resolv___dns_search" = xyes; then : found=yes else found=no @@ -86991,7 +87163,7 @@ $as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lbind" >&5 $as_echo_n "checking for dns_search in -lbind... " >&6; } -if test "${ac_cv_lib_bind_dns_search+set}" = set; then : +if ${ac_cv_lib_bind_dns_search+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -87025,13 +87197,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dns_search" >&5 $as_echo "$ac_cv_lib_bind_dns_search" >&6; } -if test "x$ac_cv_lib_bind_dns_search" = x""yes; then : +if test "x$ac_cv_lib_bind_dns_search" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lbind" >&5 $as_echo_n "checking for __dns_search in -lbind... " >&6; } -if test "${ac_cv_lib_bind___dns_search+set}" = set; then : +if ${ac_cv_lib_bind___dns_search+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -87065,7 +87237,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dns_search" >&5 $as_echo "$ac_cv_lib_bind___dns_search" >&6; } -if test "x$ac_cv_lib_bind___dns_search" = x""yes; then : +if test "x$ac_cv_lib_bind___dns_search" = xyes; then : found=yes else found=no @@ -87123,7 +87295,7 @@ $as_echo "#define HAVE_LIBBIND 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lsocket" >&5 $as_echo_n "checking for dns_search in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_dns_search+set}" = set; then : +if ${ac_cv_lib_socket_dns_search+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -87157,13 +87329,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dns_search" >&5 $as_echo "$ac_cv_lib_socket_dns_search" >&6; } -if test "x$ac_cv_lib_socket_dns_search" = x""yes; then : +if test "x$ac_cv_lib_socket_dns_search" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lsocket" >&5 $as_echo_n "checking for __dns_search in -lsocket... " >&6; } -if test "${ac_cv_lib_socket___dns_search+set}" = set; then : +if ${ac_cv_lib_socket___dns_search+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -87197,7 +87369,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dns_search" >&5 $as_echo "$ac_cv_lib_socket___dns_search" >&6; } -if test "x$ac_cv_lib_socket___dns_search" = x""yes; then : +if test "x$ac_cv_lib_socket___dns_search" = xyes; then : found=yes else found=no @@ -87269,11 +87441,11 @@ $as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h unset found ac_fn_c_check_func "$LINENO" "dn_expand" "ac_cv_func_dn_expand" -if test "x$ac_cv_func_dn_expand" = x""yes; then : +if test "x$ac_cv_func_dn_expand" = xyes; then : found=yes else ac_fn_c_check_func "$LINENO" "__dn_expand" "ac_cv_func___dn_expand" -if test "x$ac_cv_func___dn_expand" = x""yes; then : +if test "x$ac_cv_func___dn_expand" = xyes; then : found=yes else found=no @@ -87297,7 +87469,7 @@ $as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lresolv" >&5 $as_echo_n "checking for dn_expand in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then : +if ${ac_cv_lib_resolv_dn_expand+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -87331,13 +87503,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_expand" >&5 $as_echo "$ac_cv_lib_resolv_dn_expand" >&6; } -if test "x$ac_cv_lib_resolv_dn_expand" = x""yes; then : +if test "x$ac_cv_lib_resolv_dn_expand" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lresolv" >&5 $as_echo_n "checking for __dn_expand in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv___dn_expand+set}" = set; then : +if ${ac_cv_lib_resolv___dn_expand+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -87371,7 +87543,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_expand" >&5 $as_echo "$ac_cv_lib_resolv___dn_expand" >&6; } -if test "x$ac_cv_lib_resolv___dn_expand" = x""yes; then : +if test "x$ac_cv_lib_resolv___dn_expand" = xyes; then : found=yes else found=no @@ -87429,7 +87601,7 @@ $as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lbind" >&5 $as_echo_n "checking for dn_expand in -lbind... " >&6; } -if test "${ac_cv_lib_bind_dn_expand+set}" = set; then : +if ${ac_cv_lib_bind_dn_expand+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -87463,13 +87635,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_expand" >&5 $as_echo "$ac_cv_lib_bind_dn_expand" >&6; } -if test "x$ac_cv_lib_bind_dn_expand" = x""yes; then : +if test "x$ac_cv_lib_bind_dn_expand" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lbind" >&5 $as_echo_n "checking for __dn_expand in -lbind... " >&6; } -if test "${ac_cv_lib_bind___dn_expand+set}" = set; then : +if ${ac_cv_lib_bind___dn_expand+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -87503,7 +87675,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_expand" >&5 $as_echo "$ac_cv_lib_bind___dn_expand" >&6; } -if test "x$ac_cv_lib_bind___dn_expand" = x""yes; then : +if test "x$ac_cv_lib_bind___dn_expand" = xyes; then : found=yes else found=no @@ -87561,7 +87733,7 @@ $as_echo "#define HAVE_LIBBIND 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lsocket" >&5 $as_echo_n "checking for dn_expand in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_dn_expand+set}" = set; then : +if ${ac_cv_lib_socket_dn_expand+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -87595,13 +87767,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_expand" >&5 $as_echo "$ac_cv_lib_socket_dn_expand" >&6; } -if test "x$ac_cv_lib_socket_dn_expand" = x""yes; then : +if test "x$ac_cv_lib_socket_dn_expand" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lsocket" >&5 $as_echo_n "checking for __dn_expand in -lsocket... " >&6; } -if test "${ac_cv_lib_socket___dn_expand+set}" = set; then : +if ${ac_cv_lib_socket___dn_expand+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -87635,7 +87807,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_expand" >&5 $as_echo "$ac_cv_lib_socket___dn_expand" >&6; } -if test "x$ac_cv_lib_socket___dn_expand" = x""yes; then : +if test "x$ac_cv_lib_socket___dn_expand" = xyes; then : found=yes else found=no @@ -87707,11 +87879,11 @@ $as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h unset found ac_fn_c_check_func "$LINENO" "dn_skipname" "ac_cv_func_dn_skipname" -if test "x$ac_cv_func_dn_skipname" = x""yes; then : +if test "x$ac_cv_func_dn_skipname" = xyes; then : found=yes else ac_fn_c_check_func "$LINENO" "__dn_skipname" "ac_cv_func___dn_skipname" -if test "x$ac_cv_func___dn_skipname" = x""yes; then : +if test "x$ac_cv_func___dn_skipname" = xyes; then : found=yes else found=no @@ -87735,7 +87907,7 @@ $as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lresolv" >&5 $as_echo_n "checking for dn_skipname in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv_dn_skipname+set}" = set; then : +if ${ac_cv_lib_resolv_dn_skipname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -87769,13 +87941,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_skipname" >&5 $as_echo "$ac_cv_lib_resolv_dn_skipname" >&6; } -if test "x$ac_cv_lib_resolv_dn_skipname" = x""yes; then : +if test "x$ac_cv_lib_resolv_dn_skipname" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lresolv" >&5 $as_echo_n "checking for __dn_skipname in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv___dn_skipname+set}" = set; then : +if ${ac_cv_lib_resolv___dn_skipname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -87809,7 +87981,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_skipname" >&5 $as_echo "$ac_cv_lib_resolv___dn_skipname" >&6; } -if test "x$ac_cv_lib_resolv___dn_skipname" = x""yes; then : +if test "x$ac_cv_lib_resolv___dn_skipname" = xyes; then : found=yes else found=no @@ -87867,7 +88039,7 @@ $as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lbind" >&5 $as_echo_n "checking for dn_skipname in -lbind... " >&6; } -if test "${ac_cv_lib_bind_dn_skipname+set}" = set; then : +if ${ac_cv_lib_bind_dn_skipname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -87901,13 +88073,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_skipname" >&5 $as_echo "$ac_cv_lib_bind_dn_skipname" >&6; } -if test "x$ac_cv_lib_bind_dn_skipname" = x""yes; then : +if test "x$ac_cv_lib_bind_dn_skipname" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lbind" >&5 $as_echo_n "checking for __dn_skipname in -lbind... " >&6; } -if test "${ac_cv_lib_bind___dn_skipname+set}" = set; then : +if ${ac_cv_lib_bind___dn_skipname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -87941,7 +88113,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_skipname" >&5 $as_echo "$ac_cv_lib_bind___dn_skipname" >&6; } -if test "x$ac_cv_lib_bind___dn_skipname" = x""yes; then : +if test "x$ac_cv_lib_bind___dn_skipname" = xyes; then : found=yes else found=no @@ -87999,7 +88171,7 @@ $as_echo "#define HAVE_LIBBIND 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lsocket" >&5 $as_echo_n "checking for dn_skipname in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_dn_skipname+set}" = set; then : +if ${ac_cv_lib_socket_dn_skipname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -88033,13 +88205,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_skipname" >&5 $as_echo "$ac_cv_lib_socket_dn_skipname" >&6; } -if test "x$ac_cv_lib_socket_dn_skipname" = x""yes; then : +if test "x$ac_cv_lib_socket_dn_skipname" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lsocket" >&5 $as_echo_n "checking for __dn_skipname in -lsocket... " >&6; } -if test "${ac_cv_lib_socket___dn_skipname+set}" = set; then : +if ${ac_cv_lib_socket___dn_skipname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -88073,7 +88245,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_skipname" >&5 $as_echo "$ac_cv_lib_socket___dn_skipname" >&6; } -if test "x$ac_cv_lib_socket___dn_skipname" = x""yes; then : +if test "x$ac_cv_lib_socket___dn_skipname" = xyes; then : found=yes else found=no @@ -88147,11 +88319,11 @@ $as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h unset found ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search" -if test "x$ac_cv_func_res_search" = x""yes; then : +if test "x$ac_cv_func_res_search" = xyes; then : found=yes else ac_fn_c_check_func "$LINENO" "__res_search" "ac_cv_func___res_search" -if test "x$ac_cv_func___res_search" = x""yes; then : +if test "x$ac_cv_func___res_search" = xyes; then : found=yes else found=no @@ -88175,7 +88347,7 @@ $as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5 $as_echo_n "checking for res_search in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv_res_search+set}" = set; then : +if ${ac_cv_lib_resolv_res_search+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -88209,13 +88381,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5 $as_echo "$ac_cv_lib_resolv_res_search" >&6; } -if test "x$ac_cv_lib_resolv_res_search" = x""yes; then : +if test "x$ac_cv_lib_resolv_res_search" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lresolv" >&5 $as_echo_n "checking for __res_search in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv___res_search+set}" = set; then : +if ${ac_cv_lib_resolv___res_search+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -88249,7 +88421,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_search" >&5 $as_echo "$ac_cv_lib_resolv___res_search" >&6; } -if test "x$ac_cv_lib_resolv___res_search" = x""yes; then : +if test "x$ac_cv_lib_resolv___res_search" = xyes; then : found=yes else found=no @@ -88307,7 +88479,7 @@ $as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lbind" >&5 $as_echo_n "checking for res_search in -lbind... " >&6; } -if test "${ac_cv_lib_bind_res_search+set}" = set; then : +if ${ac_cv_lib_bind_res_search+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -88341,13 +88513,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_search" >&5 $as_echo "$ac_cv_lib_bind_res_search" >&6; } -if test "x$ac_cv_lib_bind_res_search" = x""yes; then : +if test "x$ac_cv_lib_bind_res_search" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lbind" >&5 $as_echo_n "checking for __res_search in -lbind... " >&6; } -if test "${ac_cv_lib_bind___res_search+set}" = set; then : +if ${ac_cv_lib_bind___res_search+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -88381,7 +88553,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_search" >&5 $as_echo "$ac_cv_lib_bind___res_search" >&6; } -if test "x$ac_cv_lib_bind___res_search" = x""yes; then : +if test "x$ac_cv_lib_bind___res_search" = xyes; then : found=yes else found=no @@ -88439,7 +88611,7 @@ $as_echo "#define HAVE_LIBBIND 1" >>confdefs.h unset found { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lsocket" >&5 $as_echo_n "checking for res_search in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_res_search+set}" = set; then : +if ${ac_cv_lib_socket_res_search+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -88473,13 +88645,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_search" >&5 $as_echo "$ac_cv_lib_socket_res_search" >&6; } -if test "x$ac_cv_lib_socket_res_search" = x""yes; then : +if test "x$ac_cv_lib_socket_res_search" = xyes; then : found=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lsocket" >&5 $as_echo_n "checking for __res_search in -lsocket... " >&6; } -if test "${ac_cv_lib_socket___res_search+set}" = set; then : +if ${ac_cv_lib_socket___res_search+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -88513,7 +88685,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_search" >&5 $as_echo "$ac_cv_lib_socket___res_search" >&6; } -if test "x$ac_cv_lib_socket___res_search" = x""yes; then : +if test "x$ac_cv_lib_socket___res_search" = xyes; then : found=yes else found=no @@ -88582,7 +88754,7 @@ $as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether atof() accepts NAN" >&5 $as_echo_n "checking whether atof() accepts NAN... " >&6; } -if test "${ac_cv_atof_accept_nan+set}" = set; then : +if ${ac_cv_atof_accept_nan+:} false; then : $as_echo_n "(cached) " >&6 else @@ -88635,7 +88807,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether atof() accepts INF" >&5 $as_echo_n "checking whether atof() accepts INF... " >&6; } -if test "${ac_cv_atof_accept_inf+set}" = set; then : +if ${ac_cv_atof_accept_inf+:} false; then : $as_echo_n "(cached) " >&6 else @@ -88691,7 +88863,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether HUGE_VAL == INF" >&5 $as_echo_n "checking whether HUGE_VAL == INF... " >&6; } -if test "${ac_cv_huge_val_inf+set}" = set; then : +if ${ac_cv_huge_val_inf+:} false; then : $as_echo_n "(cached) " >&6 else @@ -88747,7 +88919,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5 $as_echo_n "checking whether HUGE_VAL + -HUGEVAL == NAN... " >&6; } -if test "${ac_cv_huge_val_nan+set}" = set; then : +if ${ac_cv_huge_val_nan+:} false; then : $as_echo_n "(cached) " >&6 else @@ -88805,7 +88977,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime() declaration fails" >&5 $as_echo_n "checking whether strptime() declaration fails... " >&6; } -if test "${ac_cv_strptime_decl_fails+set}" = set; then : +if ${ac_cv_strptime_decl_fails+:} false; then : $as_echo_n "(cached) " >&6 else @@ -88851,7 +89023,7 @@ fi for ac_header in wchar.h do : ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default" -if test "x$ac_cv_header_wchar_h" = x""yes; then : +if test "x$ac_cv_header_wchar_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_WCHAR_H 1 _ACEOF @@ -88863,7 +89035,7 @@ done for ac_func in mblen do : ac_fn_c_check_func "$LINENO" "mblen" "ac_cv_func_mblen" -if test "x$ac_cv_func_mblen" = x""yes; then : +if test "x$ac_cv_func_mblen" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_MBLEN 1 _ACEOF @@ -88875,8 +89047,7 @@ for ac_func in mbrlen mbsinit 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 @@ -88886,7 +89057,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5 $as_echo_n "checking for mbstate_t... " >&6; } -if test "${ac_cv_type_mbstate_t+set}" = set; then : +if ${ac_cv_type_mbstate_t+:} false; then : $as_echo_n "(cached) " >&6 else @@ -88929,7 +89100,7 @@ fi for ac_header in atomic.h do : ac_fn_c_check_header_mongrel "$LINENO" "atomic.h" "ac_cv_header_atomic_h" "$ac_includes_default" -if test "x$ac_cv_header_atomic_h" = x""yes; then : +if test "x$ac_cv_header_atomic_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_ATOMIC_H 1 _ACEOF @@ -89347,7 +89518,7 @@ $as_echo "$ext_output" >&6; } if test "$PHP_SYBASE_CT" != "no"; then if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then - as_fn_error "You can not use both --with-sybase and --with-sybase-ct in same build!" "$LINENO" 5 + as_fn_error $? "You can not use both --with-sybase and --with-sybase-ct in same build!" "$LINENO" 5 fi @@ -89664,7 +89835,7 @@ EOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long int" >&5 $as_echo_n "checking size of long int... " >&6; } -if test "${ac_cv_sizeof_long_int+set}" = set; then : +if ${ac_cv_sizeof_long_int+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long int))" "ac_cv_sizeof_long_int" "$ac_includes_default"; then : @@ -89673,9 +89844,8 @@ else if test "$ac_cv_type_long_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 (long int) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (long int) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_int=0 fi @@ -89742,7 +89912,7 @@ $as_echo "found in $SYBASE_CT_INCDIR" >&6; } fi else - as_fn_error "ctpublic.h missing!" "$LINENO" 5 + as_fn_error $? "ctpublic.h missing!" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking Checking Sybase libdir" >&5 @@ -90020,7 +90190,7 @@ $as_echo "Sybase64: $SYBASE_CT_LIBS" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for netg_errstr in -lsybtcl64" >&5 $as_echo_n "checking for netg_errstr in -lsybtcl64... " >&6; } -if test "${ac_cv_lib_sybtcl64_netg_errstr+set}" = set; then : +if ${ac_cv_lib_sybtcl64_netg_errstr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -90054,7 +90224,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybtcl64_netg_errstr" >&5 $as_echo "$ac_cv_lib_sybtcl64_netg_errstr" >&6; } -if test "x$ac_cv_lib_sybtcl64_netg_errstr" = x""yes; then : +if test "x$ac_cv_lib_sybtcl64_netg_errstr" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -90215,7 +90385,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for insck__getVdate in -linsck64" >&5 $as_echo_n "checking for insck__getVdate in -linsck64... " >&6; } -if test "${ac_cv_lib_insck64_insck__getVdate+set}" = set; then : +if ${ac_cv_lib_insck64_insck__getVdate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -90249,7 +90419,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck64_insck__getVdate" >&5 $as_echo "$ac_cv_lib_insck64_insck__getVdate" >&6; } -if test "x$ac_cv_lib_insck64_insck__getVdate" = x""yes; then : +if test "x$ac_cv_lib_insck64_insck__getVdate" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -90383,7 +90553,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bsd_tcp in -linsck64" >&5 $as_echo_n "checking for bsd_tcp in -linsck64... " >&6; } -if test "${ac_cv_lib_insck64_bsd_tcp+set}" = set; then : +if ${ac_cv_lib_insck64_bsd_tcp+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -90417,7 +90587,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck64_bsd_tcp" >&5 $as_echo "$ac_cv_lib_insck64_bsd_tcp" >&6; } -if test "x$ac_cv_lib_insck64_bsd_tcp" = x""yes; then : +if test "x$ac_cv_lib_insck64_bsd_tcp" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -90651,7 +90821,7 @@ $as_echo "Sybase32 syb-prefix: $SYBASE_CT_LIBS" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for netg_errstr in -lsybtcl" >&5 $as_echo_n "checking for netg_errstr in -lsybtcl... " >&6; } -if test "${ac_cv_lib_sybtcl_netg_errstr+set}" = set; then : +if ${ac_cv_lib_sybtcl_netg_errstr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -90685,7 +90855,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybtcl_netg_errstr" >&5 $as_echo "$ac_cv_lib_sybtcl_netg_errstr" >&6; } -if test "x$ac_cv_lib_sybtcl_netg_errstr" = x""yes; then : +if test "x$ac_cv_lib_sybtcl_netg_errstr" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -90846,7 +91016,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for insck__getVdate in -linsck" >&5 $as_echo_n "checking for insck__getVdate in -linsck... " >&6; } -if test "${ac_cv_lib_insck_insck__getVdate+set}" = set; then : +if ${ac_cv_lib_insck_insck__getVdate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -90880,7 +91050,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck_insck__getVdate" >&5 $as_echo "$ac_cv_lib_insck_insck__getVdate" >&6; } -if test "x$ac_cv_lib_insck_insck__getVdate" = x""yes; then : +if test "x$ac_cv_lib_insck_insck__getVdate" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -91014,7 +91184,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bsd_tcp in -linsck" >&5 $as_echo_n "checking for bsd_tcp in -linsck... " >&6; } -if test "${ac_cv_lib_insck_bsd_tcp+set}" = set; then : +if ${ac_cv_lib_insck_bsd_tcp+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -91048,7 +91218,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck_bsd_tcp" >&5 $as_echo "$ac_cv_lib_insck_bsd_tcp" >&6; } -if test "x$ac_cv_lib_insck_bsd_tcp" = x""yes; then : +if test "x$ac_cv_lib_insck_bsd_tcp" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -91282,7 +91452,7 @@ $as_echo "Sybase32 default: $SYBASE_CT_LIBS" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for netg_errstr in -ltcl" >&5 $as_echo_n "checking for netg_errstr in -ltcl... " >&6; } -if test "${ac_cv_lib_tcl_netg_errstr+set}" = set; then : +if ${ac_cv_lib_tcl_netg_errstr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -91316,7 +91486,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tcl_netg_errstr" >&5 $as_echo "$ac_cv_lib_tcl_netg_errstr" >&6; } -if test "x$ac_cv_lib_tcl_netg_errstr" = x""yes; then : +if test "x$ac_cv_lib_tcl_netg_errstr" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -91477,7 +91647,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for insck__getVdate in -linsck" >&5 $as_echo_n "checking for insck__getVdate in -linsck... " >&6; } -if test "${ac_cv_lib_insck_insck__getVdate+set}" = set; then : +if ${ac_cv_lib_insck_insck__getVdate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -91511,7 +91681,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck_insck__getVdate" >&5 $as_echo "$ac_cv_lib_insck_insck__getVdate" >&6; } -if test "x$ac_cv_lib_insck_insck__getVdate" = x""yes; then : +if test "x$ac_cv_lib_insck_insck__getVdate" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -91645,7 +91815,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bsd_tcp in -linsck" >&5 $as_echo_n "checking for bsd_tcp in -linsck... " >&6; } -if test "${ac_cv_lib_insck_bsd_tcp+set}" = set; then : +if ${ac_cv_lib_insck_bsd_tcp+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -91679,7 +91849,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck_bsd_tcp" >&5 $as_echo "$ac_cv_lib_insck_bsd_tcp" >&6; } -if test "x$ac_cv_lib_insck_bsd_tcp" = x""yes; then : +if test "x$ac_cv_lib_insck_bsd_tcp" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -91766,10 +91936,10 @@ $as_echo "$ext_output" >&6; } if test "$PHP_SYSVMSG" != "no"; then ac_fn_c_check_header_mongrel "$LINENO" "sys/msg.h" "ac_cv_header_sys_msg_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_msg_h" = x""yes; then : +if test "x$ac_cv_header_sys_msg_h" = xyes; then : else - as_fn_error "Cannot enable System V IPC support, sys/msg.h is missing" "$LINENO" 5 + as_fn_error $? "Cannot enable System V IPC support, sys/msg.h is missing" "$LINENO" 5 fi @@ -92417,7 +92587,7 @@ $as_echo "#define HAVE_SYSVSEM 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for union semun" >&5 $as_echo_n "checking for union semun... " >&6; } -if test "${php_cv_semun+set}" = set; then : +if ${php_cv_semun+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -92869,7 +93039,7 @@ if test "$PHP_TIDY" != "no"; then done if test -z "$TIDY_DIR"; then - as_fn_error "Cannot find libtidy" "$LINENO" 5 + as_fn_error $? "Cannot find libtidy" "$LINENO" 5 fi TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR @@ -93100,7 +93270,7 @@ if test "$PHP_TIDY" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -ltidy" >&5 $as_echo_n "checking for tidyOptGetDoc in -ltidy... " >&6; } -if test "${ac_cv_lib_tidy_tidyOptGetDoc+set}" = set; then : +if ${ac_cv_lib_tidy_tidyOptGetDoc+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -93134,7 +93304,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tidy_tidyOptGetDoc" >&5 $as_echo "$ac_cv_lib_tidy_tidyOptGetDoc" >&6; } -if test "x$ac_cv_lib_tidy_tidyOptGetDoc" = x""yes; then : +if test "x$ac_cv_lib_tidy_tidyOptGetDoc" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -93903,13 +94073,13 @@ if test "$PHP_WDDX" != "no"; then if test "$PHP_LIBEXPAT_DIR" = "no"; then if test "$PHP_LIBXML" = "no"; then - as_fn_error "WDDX extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 + as_fn_error $? "WDDX extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 $as_echo_n "checking for xml2-config path... " >&6; } -if test "${ac_cv_php_xml2_config_path+set}" = set; then : +if ${ac_cv_php_xml2_config_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -94067,7 +94237,7 @@ $as_echo "$ac_cv_php_xml2_config_path" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 $as_echo_n "checking whether libxml build works... " >&6; } -if test "${php_cv_libxml_build_works+set}" = set; then : +if ${php_cv_libxml_build_works+:} false; then : $as_echo_n "(cached) " >&6 else @@ -94105,7 +94275,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "build test failed. Please check the config.log for details." "$LINENO" 5 + as_fn_error $? "build test failed. Please check the config.log for details." "$LINENO" 5 fi @@ -94176,10 +94346,10 @@ EOF fi else - as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5 + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi else - as_fn_error "xml2-config not found. Use --with-libxml-dir=<DIR>" "$LINENO" 5 + as_fn_error $? "xml2-config not found. Use --with-libxml-dir=<DIR>" "$LINENO" 5 fi @@ -94194,7 +94364,7 @@ else done if test -z "$EXPAT_DIR"; then - as_fn_error "not found. Please reinstall the expat distribution." "$LINENO" 5 + as_fn_error $? "not found. Please reinstall the expat distribution." "$LINENO" 5 fi @@ -94631,7 +94801,7 @@ EOF is_it_shared=$PHP_LIBXML_SHARED is_it_enabled=$PHP_LIBXML if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension wddx to build statically, but it depends on extension libxml, which you've configured to build shared. You either need to build wddx shared or build libxml statically for the @@ -94639,7 +94809,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension wddx, which depends on extension libxml, but you've either not enabled libxml, or have disabled it. " "$LINENO" 5 @@ -94750,13 +94920,13 @@ if test "$PHP_XML" != "no"; then if test "$PHP_LIBEXPAT_DIR" = "no"; then if test "$PHP_LIBXML" = "no"; then - as_fn_error "XML extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 + as_fn_error $? "XML extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 $as_echo_n "checking for xml2-config path... " >&6; } -if test "${ac_cv_php_xml2_config_path+set}" = set; then : +if ${ac_cv_php_xml2_config_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -94914,7 +95084,7 @@ $as_echo "$ac_cv_php_xml2_config_path" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 $as_echo_n "checking whether libxml build works... " >&6; } -if test "${php_cv_libxml_build_works+set}" = set; then : +if ${php_cv_libxml_build_works+:} false; then : $as_echo_n "(cached) " >&6 else @@ -94952,7 +95122,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "build test failed. Please check the config.log for details." "$LINENO" 5 + as_fn_error $? "build test failed. Please check the config.log for details." "$LINENO" 5 fi @@ -94977,7 +95147,7 @@ $as_echo "#define HAVE_LIBXML 1" >>confdefs.h is_it_shared=$PHP_LIBXML_SHARED is_it_enabled=$PHP_LIBXML if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension xml to build statically, but it depends on extension libxml, which you've configured to build shared. You either need to build xml shared or build libxml statically for the @@ -94985,7 +95155,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension xml, which depends on extension libxml, but you've either not enabled libxml, or have disabled it. " "$LINENO" 5 @@ -94993,10 +95163,10 @@ but you've either not enabled libxml, or have disabled it. else - as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5 + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi else - as_fn_error "xml2-config not found. Use --with-libxml-dir=<DIR>" "$LINENO" 5 + as_fn_error $? "xml2-config not found. Use --with-libxml-dir=<DIR>" "$LINENO" 5 fi @@ -95011,7 +95181,7 @@ else done if test -z "$EXPAT_DIR"; then - as_fn_error "not found. Please reinstall the expat distribution." "$LINENO" 5 + as_fn_error $? "not found. Please reinstall the expat distribution." "$LINENO" 5 fi @@ -95540,13 +95710,13 @@ fi if test "$PHP_XMLREADER" != "no"; then if test "$PHP_LIBXML" = "no"; then - as_fn_error "XMLReader extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 + as_fn_error $? "XMLReader extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 $as_echo_n "checking for xml2-config path... " >&6; } -if test "${ac_cv_php_xml2_config_path+set}" = set; then : +if ${ac_cv_php_xml2_config_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -95704,7 +95874,7 @@ $as_echo "$ac_cv_php_xml2_config_path" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 $as_echo_n "checking whether libxml build works... " >&6; } -if test "${php_cv_libxml_build_works+set}" = set; then : +if ${php_cv_libxml_build_works+:} false; then : $as_echo_n "(cached) " >&6 else @@ -95742,7 +95912,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "build test failed. Please check the config.log for details." "$LINENO" 5 + as_fn_error $? "build test failed. Please check the config.log for details." "$LINENO" 5 fi @@ -96062,7 +96232,7 @@ EOF is_it_shared=$PHP_DOM_SHARED is_it_enabled=$PHP_DOM if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension xmlreader to build statically, but it depends on extension dom, which you've configured to build shared. You either need to build xmlreader shared or build dom statically for the @@ -96070,7 +96240,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension xmlreader, which depends on extension dom, but you've either not enabled dom, or have disabled it. " "$LINENO" 5 @@ -96081,10 +96251,10 @@ but you've either not enabled dom, or have disabled it. else - as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5 + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi else - as_fn_error "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 + as_fn_error $? "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 fi @@ -96230,7 +96400,7 @@ if test "$PHP_XMLRPC" != "no"; then is_it_shared=$PHP_LIBXML_SHARED is_it_enabled=$PHP_LIBXML if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension xmlrpc to build statically, but it depends on extension libxml, which you've configured to build shared. You either need to build xmlrpc shared or build libxml statically for the @@ -96238,7 +96408,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension xmlrpc, which depends on extension libxml, but you've either not enabled libxml, or have disabled it. " "$LINENO" 5 @@ -96254,13 +96424,13 @@ $as_echo "#define HAVE_XMLRPC 1" >>confdefs.h if test "$PHP_LIBEXPAT_DIR" = "no"; then if test "$PHP_LIBXML" = "no"; then - as_fn_error "XML-RPC extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 + as_fn_error $? "XML-RPC extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 $as_echo_n "checking for xml2-config path... " >&6; } -if test "${ac_cv_php_xml2_config_path+set}" = set; then : +if ${ac_cv_php_xml2_config_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -96418,7 +96588,7 @@ $as_echo "$ac_cv_php_xml2_config_path" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 $as_echo_n "checking whether libxml build works... " >&6; } -if test "${php_cv_libxml_build_works+set}" = set; then : +if ${php_cv_libxml_build_works+:} false; then : $as_echo_n "(cached) " >&6 else @@ -96456,7 +96626,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "build test failed. Please check the config.log for details." "$LINENO" 5 + as_fn_error $? "build test failed. Please check the config.log for details." "$LINENO" 5 fi @@ -96527,10 +96697,10 @@ EOF fi else - as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5 + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi else - as_fn_error "xml2-config not found. Use --with-libxml-dir=<DIR>" "$LINENO" 5 + as_fn_error $? "xml2-config not found. Use --with-libxml-dir=<DIR>" "$LINENO" 5 fi @@ -96675,7 +96845,7 @@ $as_echo "#define HAVE_LIBEXPAT 1" >>confdefs.h done if test "$testval" = "no"; then - as_fn_error "XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)" "$LINENO" 5 + as_fn_error $? "XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)" "$LINENO" 5 fi fi @@ -96711,14 +96881,14 @@ $as_echo "#define HAVE_LIBEXPAT 1" >>confdefs.h LIBS_save="$LIBS" LIBS= ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv" -if test "x$ac_cv_func_iconv" = x""yes; then : +if test "x$ac_cv_func_iconv" = xyes; then : found_iconv=yes else ac_fn_c_check_func "$LINENO" "libiconv" "ac_cv_func_libiconv" -if test "x$ac_cv_func_libiconv" = x""yes; then : +if test "x$ac_cv_func_libiconv" = xyes; then : echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h @@ -96754,7 +96924,7 @@ $as_echo "#define HAVE_GICONV_H 1" >>confdefs.h done if test -z "$ICONV_DIR"; then - as_fn_error "Please specify the install prefix of iconv with --with-iconv=<DIR>" "$LINENO" 5 + as_fn_error $? "Please specify the install prefix of iconv with --with-iconv=<DIR>" "$LINENO" 5 fi if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || @@ -96860,7 +97030,7 @@ $as_echo "#define HAVE_GICONV_H 1" >>confdefs.h as_ac_Lib=`$as_echo "ac_cv_lib_$iconv_lib_name''_libiconv" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv in -l$iconv_lib_name" >&5 $as_echo_n "checking for libiconv in -l$iconv_lib_name... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -96895,8 +97065,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -97022,7 +97191,7 @@ else as_ac_Lib=`$as_echo "ac_cv_lib_$iconv_lib_name''_iconv" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv in -l$iconv_lib_name" >&5 $as_echo_n "checking for iconv in -l$iconv_lib_name... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -97057,8 +97226,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -97221,7 +97389,7 @@ $as_echo "#define HAVE_ICONV 1" >>confdefs.h fi else - as_fn_error "iconv not found, in order to build xmlrpc you need the iconv library" "$LINENO" 5 + as_fn_error $? "iconv not found, in order to build xmlrpc you need the iconv library" "$LINENO" 5 fi @@ -97234,7 +97402,7 @@ if test "$PHP_XMLRPC" = "yes"; 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 @@ -97246,7 +97414,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -97274,7 +97442,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 @@ -97286,7 +97454,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -97323,7 +97491,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then : +if ${ac_cv_c_inline+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_inline=no @@ -97376,7 +97544,7 @@ $as_echo "#define UNDEF_THREADS_HACK /**/" >>confdefs.h { $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 @@ -97490,8 +97658,7 @@ for ac_header in xmlparse.h xmltok.h stdlib.h strings.h string.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 @@ -97511,7 +97678,7 @@ done # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5 $as_echo_n "checking size of char... " >&6; } -if test "${ac_cv_sizeof_char+set}" = set; then : +if ${ac_cv_sizeof_char+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char" "$ac_includes_default"; then : @@ -97520,9 +97687,8 @@ else if test "$ac_cv_type_char" = 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 (char) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (char) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_char=0 fi @@ -97546,7 +97712,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 : @@ -97555,9 +97721,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 @@ -97580,7 +97745,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 : @@ -97589,9 +97754,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 @@ -97614,7 +97778,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 : @@ -97623,9 +97787,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 @@ -97643,7 +97806,7 @@ _ACEOF 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 @@ -97655,7 +97818,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 @@ -97690,7 +97853,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 @@ -97731,8 +97894,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 @@ -98085,7 +98247,7 @@ $as_echo "found in $i" >&6; } if test -z "$XMLRPC_DIR"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - as_fn_error "Please reinstall the XMLRPC-EPI distribution" "$LINENO" 5 + as_fn_error $? "Please reinstall the XMLRPC-EPI distribution" "$LINENO" 5 fi @@ -98586,13 +98748,13 @@ fi if test "$PHP_XMLWRITER" != "no"; then if test "$PHP_LIBXML" = "no"; then - as_fn_error "XMLWriter extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 + as_fn_error $? "XMLWriter extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 $as_echo_n "checking for xml2-config path... " >&6; } -if test "${ac_cv_php_xml2_config_path+set}" = set; then : +if ${ac_cv_php_xml2_config_path+:} false; then : $as_echo_n "(cached) " >&6 else @@ -98750,7 +98912,7 @@ $as_echo "$ac_cv_php_xml2_config_path" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 $as_echo_n "checking whether libxml build works... " >&6; } -if test "${php_cv_libxml_build_works+set}" = set; then : +if ${php_cv_libxml_build_works+:} false; then : $as_echo_n "(cached) " >&6 else @@ -98788,7 +98950,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "build test failed. Please check the config.log for details." "$LINENO" 5 + as_fn_error $? "build test failed. Please check the config.log for details." "$LINENO" 5 fi @@ -99108,10 +99270,10 @@ EOF else - as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5 + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi else - as_fn_error "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 + as_fn_error $? "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 fi @@ -99166,11 +99328,11 @@ $as_echo "$ext_output" >&6; } if test "$PHP_XSL" != "no"; then if test "$PHP_LIBXML" = "no"; then - as_fn_error "XSL extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 + as_fn_error $? "XSL extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi if test "$PHP_DOM" = "no"; then - as_fn_error "XSL extension requires DOM extension, add --enable-dom" "$LINENO" 5 + as_fn_error $? "XSL extension requires DOM extension, add --enable-dom" "$LINENO" 5 fi for i in $PHP_XSL /usr/local /usr; do @@ -99181,7 +99343,7 @@ if test "$PHP_XSL" != "no"; then done if test -z "$XSLT_CONFIG"; then - as_fn_error "xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" "$LINENO" 5 + as_fn_error $? "xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" "$LINENO" 5 else libxslt_full_version=`$XSLT_CONFIG --version` ac_IFS=$IFS @@ -99469,7 +99631,7 @@ $as_echo "#define HAVE_XSL_EXSLT 1" >>confdefs.h fi else - as_fn_error "libxslt version 1.1.0 or greater required." "$LINENO" 5 + as_fn_error $? "libxslt version 1.1.0 or greater required." "$LINENO" 5 fi @@ -99779,7 +99941,7 @@ EOF is_it_shared=$PHP_LIBXML_SHARED is_it_enabled=$PHP_LIBXML if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - as_fn_error " + as_fn_error $? " You've configured extension xsl to build statically, but it depends on extension libxml, which you've configured to build shared. You either need to build xsl shared or build libxml statically for the @@ -99787,7 +99949,7 @@ build to be successful. " "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - as_fn_error " + as_fn_error $? " You've configured extension xsl, which depends on extension libxml, but you've either not enabled libxml, or have disabled it. " "$LINENO" 5 @@ -99900,7 +100062,7 @@ if test "$PHP_ZIP" != "no"; then PHP_ZLIB_DIR="$PHP_ZLIB_DIR" PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" else - as_fn_error "Can not find zlib headers under \"$PHP_ZLIB_DIR\"" "$LINENO" 5 + as_fn_error $? "Can not find zlib headers under \"$PHP_ZLIB_DIR\"" "$LINENO" 5 fi else for i in /usr/local /usr; do @@ -99917,7 +100079,7 @@ if test "$PHP_ZIP" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of zlib" >&5 $as_echo_n "checking for the location of zlib... " >&6; } if test "$PHP_ZLIB_DIR" = "no"; then - as_fn_error "zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" "$LINENO" 5 + as_fn_error $? "zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_ZLIB_DIR" >&5 $as_echo "$PHP_ZLIB_DIR" >&6; } @@ -100554,7 +100716,7 @@ $as_echo "#define MYSQLND_SSL_SUPPORTED 1" >>confdefs.h if test "$PHP_OPENSSL" != "no" || test "$PHP_OPENSSL_DIR" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DSA_get_default_method in -lssl" >&5 $as_echo_n "checking for DSA_get_default_method in -lssl... " >&6; } -if test "${ac_cv_lib_ssl_DSA_get_default_method+set}" = set; then : +if ${ac_cv_lib_ssl_DSA_get_default_method+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -100588,7 +100750,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_DSA_get_default_method" >&5 $as_echo "$ac_cv_lib_ssl_DSA_get_default_method" >&6; } -if test "x$ac_cv_lib_ssl_DSA_get_default_method" = x""yes; then : +if test "x$ac_cv_lib_ssl_DSA_get_default_method" = xyes; then : $as_echo "#define HAVE_DSA_DEFAULT_METHOD 1" >>confdefs.h @@ -100596,7 +100758,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X509_free in -lcrypto" >&5 $as_echo_n "checking for X509_free in -lcrypto... " >&6; } -if test "${ac_cv_lib_crypto_X509_free+set}" = set; then : +if ${ac_cv_lib_crypto_X509_free+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -100630,7 +100792,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_X509_free" >&5 $as_echo "$ac_cv_lib_crypto_X509_free" >&6; } -if test "x$ac_cv_lib_crypto_X509_free" = x""yes; then : +if test "x$ac_cv_lib_crypto_X509_free" = xyes; then : $as_echo "#define HAVE_DSA_DEFAULT_METHOD 1" >>confdefs.h @@ -100656,7 +100818,7 @@ fi set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -100670,7 +100832,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -100702,7 +100864,7 @@ fi OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` else - as_fn_error "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 fi if test -n "$OPENSSL_LIBS"; then @@ -100857,11 +101019,11 @@ fi done if test -z "$OPENSSL_INCDIR"; then - as_fn_error "Cannot find OpenSSL's <evp.h>" "$LINENO" 5 + as_fn_error $? "Cannot find OpenSSL's <evp.h>" "$LINENO" 5 fi if test -z "$OPENSSL_LIBDIR"; then - as_fn_error "Cannot find OpenSSL's libraries" "$LINENO" 5 + as_fn_error $? "Cannot find OpenSSL's libraries" "$LINENO" 5 fi old_CPPFLAGS=$CPPFLAGS @@ -100885,7 +101047,7 @@ $as_echo ">= 0.9.6" >&6; } else - as_fn_error "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 fi rm -f conftest* @@ -101023,7 +101185,7 @@ rm -f conftest* { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_free in -lcrypto" >&5 $as_echo_n "checking for CRYPTO_free in -lcrypto... " >&6; } -if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then : +if ${ac_cv_lib_crypto_CRYPTO_free+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -101057,7 +101219,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_CRYPTO_free" >&5 $as_echo "$ac_cv_lib_crypto_CRYPTO_free" >&6; } -if test "x$ac_cv_lib_crypto_CRYPTO_free" = x""yes; then : +if test "x$ac_cv_lib_crypto_CRYPTO_free" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -101093,7 +101255,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_crypto_CRYPTO_free - as_fn_error "libcrypto not found!" "$LINENO" 5 + as_fn_error $? "libcrypto not found!" "$LINENO" 5 fi @@ -101200,7 +101362,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_ssl_version in -lssl" >&5 $as_echo_n "checking for SSL_CTX_set_ssl_version in -lssl... " >&6; } -if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then : +if ${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -101234,7 +101396,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5 $as_echo "$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6; } -if test "x$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" = x""yes; then : +if test "x$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" = xyes; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -101248,7 +101410,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version - as_fn_error "libssl not found!" "$LINENO" 5 + as_fn_error $? "libssl not found!" "$LINENO" 5 fi @@ -101685,7 +101847,7 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes" || test "$ $as_echo_n "checking whether $php_typename exists... " >&6; } php_cache_value=php_cv_sizeof_$php_typename - if { as_var=php_cv_sizeof_$php_typename; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval \${php_cv_sizeof_$php_typename+:} false; then : $as_echo_n "(cached) " >&6 else @@ -101869,7 +102031,7 @@ if test "$PHP_RECODE" != "no"; then as_ac_Lib=`$as_echo "ac_cv_lib_$MYSQL_LIBNAME''_hash_insert" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hash_insert in -l$MYSQL_LIBNAME" >&5 $as_echo_n "checking for hash_insert in -l$MYSQL_LIBNAME... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -101904,8 +102066,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -101925,7 +102086,7 @@ fi fi if test -n "$recode_conflict"; then - as_fn_error "recode extension can not be configured together with:$recode_conflict" "$LINENO" 5 + as_fn_error $? "recode extension can not be configured together with:$recode_conflict" "$LINENO" 5 fi fi @@ -102043,7 +102204,7 @@ if test "$PHP_PEAR" != "no"; then if test "$pear_error_msg"; then - as_fn_error "$pear_error_msg" "$LINENO" 5 + as_fn_error $? "$pear_error_msg" "$LINENO" 5 fi install_pear="install-pear" @@ -102098,7 +102259,7 @@ $as_echo "${T_MD}Configuring Zend${T_ME}" >&6; } if test "$YACC"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bison version" >&5 $as_echo_n "checking for bison version... " >&6; } -if test "${php_cv_bison_version+set}" = set; then : +if ${php_cv_bison_version+:} false; then : $as_echo_n "(cached) " >&6 else @@ -102154,8 +102315,7 @@ dlfcn.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 @@ -102166,7 +102326,7 @@ done 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 @@ -102178,7 +102338,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 @@ -102215,7 +102375,7 @@ _ACEOF ac_fn_c_check_type "$LINENO" "uint" "ac_cv_type_uint" "$ac_includes_default" -if test "x$ac_cv_type_uint" = x""yes; then : +if test "x$ac_cv_type_uint" = xyes; then : else @@ -102226,7 +102386,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "ulong" "ac_cv_type_ulong" "$ac_includes_default" -if test "x$ac_cv_type_ulong" = x""yes; then : +if test "x$ac_cv_type_ulong" = xyes; then : else @@ -102325,13 +102485,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 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 @@ -102343,7 +102503,7 @@ done { $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 : @@ -102407,7 +102567,7 @@ esac # for constant arguments. Useless! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 $as_echo_n "checking for working alloca.h... " >&6; } -if test "${ac_cv_working_alloca_h+set}" = set; then : +if ${ac_cv_working_alloca_h+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -102440,7 +102600,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 $as_echo_n "checking for alloca... " >&6; } -if test "${ac_cv_func_alloca_works+set}" = set; then : +if ${ac_cv_func_alloca_works+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -102459,7 +102619,7 @@ else #pragma alloca # else # ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); +void *alloca (size_t); # endif # endif # endif @@ -102503,7 +102663,7 @@ $as_echo "#define C_ALLOCA 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -if test "${ac_cv_os_cray+set}" = set; then : +if ${ac_cv_os_cray+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -102530,8 +102690,7 @@ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; 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 CRAY_STACKSEG_END $ac_func @@ -102545,7 +102704,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 $as_echo_n "checking stack direction for C alloca... " >&6; } -if test "${ac_cv_c_stack_direction+set}" = set; then : +if ${ac_cv_c_stack_direction+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -102555,23 +102714,20 @@ else /* end confdefs.h. */ $ac_includes_default int -find_stack_direction () +find_stack_direction (int *addr, int depth) { - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; + int dir, dummy = 0; + if (! addr) + addr = &dummy; + *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1; + dir = depth ? find_stack_direction (addr, depth - 1) : 0; + return dir + dummy; } int -main () +main (int argc, char **argv) { - return find_stack_direction () < 0; + return find_stack_direction (0, argc + !argv + 20) < 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : @@ -102597,8 +102753,7 @@ for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp 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 @@ -102609,7 +102764,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sprintf is broken" >&5 $as_echo_n "checking whether sprintf is broken... " >&6; } -if test "${ac_cv_broken_sprintf+set}" = set; then : +if ${ac_cv_broken_sprintf+:} false; then : $as_echo_n "(cached) " >&6 else @@ -102655,8 +102810,7 @@ for ac_func in finite isfinite isinf isnan 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 @@ -102668,7 +102822,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fp_except is defined" >&5 $as_echo_n "checking whether fp_except is defined... " >&6; } -if test "${ac_cv_type_fp_except+set}" = set; then : +if ${ac_cv_type_fp_except+:} false; then : $as_echo_n "(cached) " >&6 else @@ -102985,7 +103139,7 @@ fi 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 @@ -103003,7 +103157,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 103006 "configure" +#line 103160 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -103218,7 +103372,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then : +if ${ac_cv_c_inline+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_inline=no @@ -103483,7 +103637,7 @@ fi for ac_func in mremap do : ac_fn_c_check_func "$LINENO" "mremap" "ac_cv_func_mremap" -if test "x$ac_cv_func_mremap" = x""yes; then : +if test "x$ac_cv_func_mremap" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_MREMAP 1 _ACEOF @@ -103506,7 +103660,7 @@ fi ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" -if test "x$ac_cv_func_sigaction" = x""yes; then : +if test "x$ac_cv_func_sigaction" = xyes; then : $as_echo "#define HAVE_SIGACTION 1" >>confdefs.h @@ -103571,7 +103725,7 @@ $as_echo "${T_MD}Configuring TSRM${T_ME}" >&6; } for ac_header in stdarg.h do : ac_fn_c_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default" -if test "x$ac_cv_header_stdarg_h" = x""yes; then : +if test "x$ac_cv_header_stdarg_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STDARG_H 1 _ACEOF @@ -103584,7 +103738,7 @@ done for ac_func in sigprocmask do : ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask" -if test "x$ac_cv_func_sigprocmask" = x""yes; then : +if test "x$ac_cv_func_sigprocmask" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SIGPROCMASK 1 _ACEOF @@ -103673,14 +103827,14 @@ elif test "$TSRM_ST" != "no"; then for ac_header in st.h do : ac_fn_c_check_header_mongrel "$LINENO" "st.h" "ac_cv_header_st_h" "$ac_includes_default" -if test "x$ac_cv_header_st_h" = x""yes; then : +if test "x$ac_cv_header_st_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_ST_H 1 _ACEOF else - as_fn_error "Sorry, I was unable to locate the State Threads header file. Please specify the prefix using --with-tsrm-st=/prefix" "$LINENO" 5 + as_fn_error $? "Sorry, I was unable to locate the State Threads header file. Please specify the prefix using --with-tsrm-st=/prefix" "$LINENO" 5 fi @@ -103762,7 +103916,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5 $as_echo_n "checking for pthreads_cflags... " >&6; } -if test "${ac_cv_pthreads_cflags+set}" = set; then : +if ${ac_cv_pthreads_cflags+:} false; then : $as_echo_n "(cached) " >&6 else @@ -103828,7 +103982,7 @@ $as_echo "$ac_cv_pthreads_cflags" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5 $as_echo_n "checking for pthreads_lib... " >&6; } -if test "${ac_cv_pthreads_lib+set}" = set; then : +if ${ac_cv_pthreads_lib+:} false; then : $as_echo_n "(cached) " >&6 else @@ -103904,7 +104058,7 @@ $as_echo "#define BETHREADS 1" >>confdefs.h else if test "$pthreads_working" != "yes"; then - as_fn_error "Your system seems to lack POSIX threads." "$LINENO" 5 + as_fn_error $? "Your system seems to lack POSIX threads." "$LINENO" 5 fi @@ -104547,7 +104701,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 @@ -104584,10 +104738,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. @@ -104607,7 +104761,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' @@ -104632,7 +104786,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 @@ -104685,7 +104839,7 @@ NM="$lt_cv_path_NM" { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize 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' @@ -104915,7 +105069,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 104918 "configure"' > conftest.$ac_ext + echo '#line 105072 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -105009,7 +105163,7 @@ 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 @@ -105094,7 +105248,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then : + if ${ac_cv_prog_CXXCPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CXXCPP needs to be expanded @@ -105124,7 +105278,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. @@ -105140,11 +105294,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 @@ -105183,7 +105337,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. @@ -105199,18 +105353,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 \"$CXXCPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=cpp @@ -105226,7 +105380,7 @@ fi # 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 @@ -105350,7 +105504,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 @@ -105562,7 +105716,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 @@ -105629,7 +105783,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 @@ -105641,7 +105795,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="${ac_tool_prefix}ar" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -105669,7 +105823,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 @@ -105681,7 +105835,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="ar" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -105721,7 +105875,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 @@ -105733,7 +105887,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -105761,7 +105915,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 @@ -105773,7 +105927,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -105813,7 +105967,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 @@ -105825,7 +105979,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -105853,7 +106007,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 @@ -105865,7 +106019,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -105956,7 +106110,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 @@ -106018,7 +106172,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 @@ -106093,7 +106247,7 @@ esac set dummy ${ac_tool_prefix}dsymutil; 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_DSYMUTIL+set}" = set; then : +if ${ac_cv_prog_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then @@ -106105,7 +106259,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -106133,7 +106287,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then set dummy dsymutil; 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_DSYMUTIL+set}" = set; then : +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then @@ -106145,7 +106299,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -106185,7 +106339,7 @@ fi set dummy ${ac_tool_prefix}nmedit; 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_NMEDIT+set}" = set; then : +if ${ac_cv_prog_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then @@ -106197,7 +106351,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -106225,7 +106379,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then set dummy nmedit; 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_NMEDIT+set}" = set; then : +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -106237,7 +106391,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -106275,7 +106429,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then : +if ${lt_cv_apple_cc_single_mod+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -106298,7 +106452,7 @@ fi $as_echo "$lt_cv_apple_cc_single_mod" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : +if ${lt_cv_ld_exported_symbols_list+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no @@ -106307,7 +106461,7 @@ else LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" cat > conftest.$ac_ext <<EOF -#line 106310 "configure" +#line 106464 "configure" #include "confdefs.h" int main() { ; return 0; } @@ -106449,7 +106603,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 @@ -106465,11 +106619,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 "\"configure:106468: $lt_compile\"" >&5) + (eval echo "\"configure:106622: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:106472: \$? = $ac_status" >&5 + echo "configure:106626: \$? = $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. @@ -106747,7 +106901,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_cv_prog_compiler_pic_works+set}" = set; then : +if ${lt_cv_prog_compiler_pic_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -106763,11 +106917,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 "\"configure:106766: $lt_compile\"" >&5) + (eval echo "\"configure:106920: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:106770: \$? = $ac_status" >&5 + echo "configure:106924: \$? = $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. @@ -106810,7 +106964,7 @@ esac wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then : +if ${lt_cv_prog_compiler_static_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -106848,7 +107002,7 @@ fi { $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 @@ -106867,11 +107021,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 "\"configure:106870: $lt_compile\"" >&5) + (eval echo "\"configure:107024: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "configure:106874: \$? = $ac_status" >&5 + echo "configure:107028: \$? = $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 @@ -107331,7 +107485,7 @@ _LT_EOF # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <<EOF -#line 107334 "configure" +#line 107488 "configure" #include "confdefs.h" int main() { ; return 0; } @@ -107373,7 +107527,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <<EOF -#line 107376 "configure" +#line 107530 "configure" #include "confdefs.h" int main() { ; return 0; } @@ -108524,14 +108678,14 @@ esac $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then : +if ${lt_cv_sys_lib_search_path_spec+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" fi sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then : +if ${lt_cv_sys_lib_dlsearch_path_spec+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" @@ -108640,7 +108794,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 @@ -108674,7 +108828,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 @@ -108688,12 +108842,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 @@ -108727,16 +108881,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="-ldld" 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 @@ -108770,12 +108924,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 @@ -108809,12 +108963,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 @@ -108848,7 +109002,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="-ldld" fi @@ -108889,7 +109043,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 : @@ -108898,7 +109052,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 108901 "configure" +#line 109055 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -108989,7 +109143,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; } wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $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 : @@ -108998,7 +109152,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 109001 "configure" +#line 109155 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -109675,13 +109829,13 @@ $as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&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. @@ -109860,7 +110014,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 @@ -109897,10 +110051,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. @@ -110063,7 +110217,7 @@ case $host_os in # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <<EOF -#line 110066 "configure" +#line 110220 "configure" #include "confdefs.h" int main() { ; return 0; } @@ -110106,7 +110260,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <<EOF -#line 110109 "configure" +#line 110263 "configure" #include "confdefs.h" int main() { ; return 0; } @@ -111342,7 +111496,7 @@ if test -n "$lt_prog_compiler_pic_CXX"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then : +if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works_CXX=no @@ -111358,11 +111512,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 "\"configure:111361: $lt_compile\"" >&5) + (eval echo "\"configure:111515: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:111365: \$? = $ac_status" >&5 + echo "configure:111519: \$? = $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. @@ -111405,7 +111559,7 @@ esac wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then : +if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no @@ -111443,7 +111597,7 @@ fi { $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_CXX+set}" = set; then : +if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no @@ -111462,11 +111616,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 "\"configure:111465: $lt_compile\"" >&5) + (eval echo "\"configure:111619: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "configure:111469: \$? = $ac_status" >&5 + echo "configure:111623: \$? = $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 @@ -112161,14 +112315,14 @@ esac $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then : +if ${lt_cv_sys_lib_search_path_spec+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" fi sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then : +if ${lt_cv_sys_lib_dlsearch_path_spec+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" @@ -112656,7 +112810,7 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ;; *) - as_fn_error "Unsupported tag name: $tagname" "$LINENO" 5 + as_fn_error $? "Unsupported tag name: $tagname" "$LINENO" 5 ;; esac @@ -112674,7 +112828,7 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld 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 @@ -113349,10 +113503,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -113368,6 +113533,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$//' @@ -113383,7 +113549,7 @@ LTLIBOBJS=$ac_ltlibobjs -: ${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" @@ -113484,6 +113650,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 @@ -113529,19 +113696,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 @@ -113679,16 +113846,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -113737,7 +113904,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 @@ -113748,28 +113915,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -113791,7 +113946,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.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -113857,10 +114012,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.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -113875,11 +114030,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 @@ -113901,6 +114061,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;; @@ -113913,7 +114074,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 ;; @@ -113922,7 +114083,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" @@ -113942,7 +114103,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -114118,7 +114279,7 @@ do "$ALL_OUTPUT_FILES") CONFIG_FILES="$CONFIG_FILES $ALL_OUTPUT_FILES" ;; "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 @@ -114141,9 +114302,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 } @@ -114151,12 +114313,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. @@ -114173,12 +114336,12 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/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 @@ -114187,18 +114350,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 @@ -114206,7 +114369,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 @@ -114254,7 +114417,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 = "" @@ -114286,21 +114449,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 @@ -114312,7 +114483,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 @@ -114324,11 +114495,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 @@ -114413,7 +114584,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" @@ -114426,7 +114597,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 @@ -114445,7 +114616,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 `:'. @@ -114454,7 +114625,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'" @@ -114480,8 +114651,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 @@ -114606,23 +114777,24 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;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) # @@ -114631,21 +114803,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 ;; @@ -114662,7 +114834,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. @@ -114683,7 +114855,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 |